diff --git a/modules/auth/cms_authentication_module.e b/modules/auth/cms_authentication_module.e
index e5f1712..f6b450a 100644
--- a/modules/auth/cms_authentication_module.e
+++ b/modules/auth/cms_authentication_module.e
@@ -115,9 +115,11 @@ feature -- Router
 			a_router.handle ("/" + roc_login_location, create {WSF_URI_AGENT_HANDLER}.make (agent handle_login(a_api, ?, ?)), a_router.methods_head_get)
 			a_router.handle ("/" + roc_logout_location, create {WSF_URI_AGENT_HANDLER}.make (agent handle_logout(a_api, ?, ?)), a_router.methods_head_get)
 			a_router.handle ("/account/roc-register", create {WSF_URI_AGENT_HANDLER}.make (agent handle_register(a_api, ?, ?)), a_router.methods_get_post)
+
 			a_router.handle ("/account/activate/{token}", create {WSF_URI_TEMPLATE_AGENT_HANDLER}.make (agent handle_activation(a_api, ?, ?)), a_router.methods_head_get)
 			a_router.handle ("/account/reject/{token}", create {WSF_URI_TEMPLATE_AGENT_HANDLER}.make (agent handle_reject(a_api, ?, ?)), a_router.methods_head_get)
 			a_router.handle ("/account/reactivate", create {WSF_URI_AGENT_HANDLER}.make (agent handle_reactivation(a_api, ?, ?)), a_router.methods_get_post)
+
 			a_router.handle ("/account/new-password", create {WSF_URI_AGENT_HANDLER}.make (agent handle_new_password(a_api, ?, ?)), a_router.methods_get_post)
 			a_router.handle ("/account/reset-password", create {WSF_URI_AGENT_HANDLER}.make (agent handle_reset_password(a_api, ?, ?)), a_router.methods_get_post)
 			a_router.handle ("/account/change/{field}", create {WSF_URI_TEMPLATE_AGENT_HANDLER}.make (agent handle_change_field (a_api, ?, ?)), a_router.methods_get_post)
@@ -454,23 +456,32 @@ feature -- Handler
 						--! to CMS_USER_PROFILE and persist data
 						--! check also CMS_USER.data_items
 
-							-- Delete temporal User
-						l_user_api.delete_temp_user (l_user)
-
 							-- Valid user_id
 						l_user.set_id (0)
 						l_user.mark_active
 						l_user_api.new_user_from_temp_user (l_user)
-						l_user_api.remove_activation (l_token.value)
-						r.set_main_content ("<p> The account <i>" + html_encoded (l_user.name) + "</i> has been activated</p>")
-							-- Send Email
-						if attached l_user.email as l_email then
-							create es.make (create {CMS_AUTHENTICATION_EMAIL_SERVICE_PARAMETERS}.make (api))
-							write_debug_log (generator + ".handle register: send_contact_activation_confirmation_email")
-							es.send_contact_activation_confirmation_email (l_email, l_user, req.absolute_script_url (""))
+
+						if
+							not l_user_api.has_error and then
+							attached l_user_api.user_by_name (l_user.name) as l_new_user
+						then
+								-- Delete temporal User
+							l_user_api.delete_temp_user (l_user)
+							l_user_api.remove_activation (l_token.value)
+
+							r.set_main_content ("<p> The account <i>" + html_encoded (l_user.name) + "</i> has been activated</p>")
+								-- Send Email
+							if attached l_user.email as l_email then
+								create es.make (create {CMS_AUTHENTICATION_EMAIL_SERVICE_PARAMETERS}.make (api))
+								write_debug_log (generator + ".handle register: send_contact_activation_confirmation_email")
+								es.send_contact_activation_confirmation_email (l_email, l_user, req.absolute_script_url (""))
+							end
+						else
+								-- Failure!!!
+							r.set_status_code ({HTTP_CONSTANTS}.internal_server_error)
+							r.set_main_content ("<p>ERROR: User activation failed for <i>" + html_encoded (l_user.name) + "</i>!</p>")
 						end
-					else
-							-- the token does not exist, or it was already used.
+					else							-- the token does not exist, or it was already used.
 						r.set_status_code ({HTTP_CONSTANTS}.bad_request)
 						r.set_main_content ("<p>The token <i>" + l_token.value + "</i> is not valid " + r.link ("Reactivate Account", "account/reactivate", Void) + "</p>")
 					end
diff --git a/src/persistence/user/cms_user_storage_sql_i.e b/src/persistence/user/cms_user_storage_sql_i.e
index f6a8902..0f68cf3 100644
--- a/src/persistence/user/cms_user_storage_sql_i.e
+++ b/src/persistence/user/cms_user_storage_sql_i.e
@@ -1246,7 +1246,7 @@ feature -- New Temp User
   				sql_begin_transaction
 
   				write_information_log (generator  + ".new_user_from_temp_user")
-  				create l_parameters.make (4)
+  				create l_parameters.make (6)
   				l_parameters.put (a_user.name, "name")
   				l_parameters.put (l_password_hash, "password")
   				l_parameters.put (l_password_salt, "salt")