Index: /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py	(revision 6393)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py	(revision 6394)
@@ -434,15 +434,11 @@
 
         role_manager = IPrincipalRoleManager(self.context[pin])
-        roles = role_manager.getRolesForPrincipal(self.request.principal.id)
-        if not 'waeup.local.ApplicationOwner' in map(lambda x, y: x, roles):
-            # Assign current principal the owner role on created applicant
-            # record
-            role_manager.assignRoleToPrincipal(
-                'waeup.local.ApplicationOwner', self.request.principal.id)
-
-            # Assign current principal the PortalUser role
-            role_manager = IPrincipalRoleManager(grok.getSite()['faculties'])
-            role_manager.assignRoleToPrincipal(
-                'waeup.PortalUser', self.request.principal.id)
+        role_manager.assignRoleToPrincipal(
+            'waeup.local.ApplicationOwner', self.request.principal.id)
+
+        # Assign current principal the PortalUser role
+        role_manager = IPrincipalRoleManager(grok.getSite()['faculties'])
+        role_manager.assignRoleToPrincipal(
+            'waeup.PortalUser', self.request.principal.id)
 
         # Mark application as started
