Index: /main/waeup.ikoba/trunk/src/waeup/ikoba/customers/browser.py
===================================================================
--- /main/waeup.ikoba/trunk/src/waeup/ikoba/customers/browser.py	(revision 12531)
+++ /main/waeup.ikoba/trunk/src/waeup/ikoba/customers/browser.py	(revision 12532)
@@ -36,5 +36,5 @@
 from waeup.ikoba.interfaces import MessageFactory as _
 from waeup.ikoba.interfaces import (
-    IContactForm, IObjectHistory, IIkobaObject, IIkobaUtils,
+    IContactForm, IObjectHistory, IIkobaObject, IIkobaUtils, IExtFileStore,
     IPasswordValidator, IUserAccount,
     STARTED, VERIFIED, REJECTED, EXPIRED, CREATED, REQUESTED,
@@ -737,4 +737,10 @@
         """To be implemented in the customization package.
         """
+        store = getUtility(IExtFileStore)
+        error = ''
+        if not store.getFileByContext(self.context, attr=u'passport.jpg'):
+            error += _('Passport picture is missing.')
+        if error:
+            return error
         return
 
Index: /main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_browser.py
===================================================================
--- /main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_browser.py	(revision 12531)
+++ /main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_browser.py	(revision 12532)
@@ -611,5 +611,5 @@
         return
 
-    def test_customer_upload_passport(self):
+    def test_customer_edit_upload_upload_and_request(self):
         # Customer cant login if their password is not set
         self.browser.open(self.login_path)
@@ -619,5 +619,15 @@
         self.assertMatches(
             '...You logged in...', self.browser.contents)
-        # Admitted customer can upload a passport picture
+        self.browser.getLink("Edit").click()
+        self.browser.getControl(name="form.email").value = 'new_email@aa.ng'
+        self.browser.getControl("Save", index=1).click()
+        self.assertMatches('...Form has been saved...',
+                           self.browser.contents)
+        self.browser.getControl("Save and request registration").click()
+        self.assertMatches('...Passport picture is missing...',
+                           self.browser.contents)
+        self.assertEqual(self.customer.state, 'started')
+        # Customer must upload a passport picture
+        self.browser.open(self.customer_path)
         self.browser.getLink("Upload files").click()
         ctrl = self.browser.getControl(name='passporteditupload')
@@ -632,19 +642,9 @@
         self.browser.getControl(name="CANCEL").click()
         self.assertEqual(self.browser.url, self.customer_path)
-
-    def test_customer_baseedit(self):
-        # Customers can change the password
-        self.customer.personal_updated = datetime.utcnow()
-        self.browser.open(self.login_path)
-        self.browser.getControl(name="form.login").value = self.customer_id
-        self.browser.getControl(name="form.password").value = 'cpwd'
-        self.browser.getControl("Login").click()
-        self.assertEqual(self.browser.url, self.customer_path)
-        self.assertTrue('You logged in' in self.browser.contents)
         self.browser.getLink("Edit").click()
-        self.browser.getControl(name="form.email").value = 'new_email@aa.ng'
-        self.browser.getControl("Save", index=1).click()
-        self.assertMatches('...Form has been saved...',
+        self.browser.getControl("Save and request registration").click()
+        self.assertMatches('...Registration form has been submitted...',
                            self.browser.contents)
+        self.assertEqual(self.customer.state, 'requested')
         # Customer can view history
         self.browser.getLink("History").click()
