# This patch file was generated by NetBeans IDE
# This patch can be applied using context Tools: Apply Diff Patch action on respective folder.
# It uses platform neutral UTF-8 encoding.
# Above lines and this line are ignored by the patching process.
--- administrator/components/com_comprofiler/library/cb/cb.tables.php
+++ administrator/components/com_comprofiler/library/cb/cb.tables.php
@@ -1108,10 +1108,6 @@
 		$_CB_database->setQuery( $query );
 		$this->usertype								=	$_CB_database->loadResult();
 
-		if ( ( $this->confirmed == 0 ) && ( $this->cbactivation == '' ) && ( $ueConfig['reg_confirmation'] != 0 ) ) {
-			$this->_setActivationCode();
-		}
-
 		// creates CMS and CB objects:
 		$this->_mapUsers();
 
@@ -1149,6 +1145,10 @@
 				$this->_comprofilerUser->id		=	$this->_cmsUser->id;
 			}
 
+			if ( ( $this->confirmed == 0 ) && ( $this->cbactivation == '' ) && ( $ueConfig['reg_confirmation'] != 0 ) ) {
+				$this->_setActivationCode();
+			}
+
 			// stores CB user into comprofiler: if new, inserts, otherwise updates:
 			if ( $this->user_id == 0 ) {
 				$this->user_id						=	$this->_cmsUser->id;