diff --git a/Templates/Default/Form.txt b/Templates/Default/Form.txt
index 16dfb7f..b3a8272 100644
--- a/Templates/Default/Form.txt
+++ b/Templates/Default/Form.txt
@@ -43,28 +43,6 @@
 		  [REQUIRED:USER:Password2]
 		</div>
 
-		<div class="dnnFormItem dnnClear">
-		  [DNNLBL:USER:PasswordQuestion:HideRequired]
-		  [CTL:USER:PasswordQuestion]
-		  [REQUIRED:USER:PasswordQuestion]
-		</div>
-
-		<div class="dnnFormItem dnnClear">
-		  [DNNLBL:USER:PasswordAnswer:HideRequired]
-		  [CTL:USER:PasswordAnswer]
-		  [REQUIRED:USER:PasswordAnswer]
-		</div>
-
-		<div>Would you like to join the DNN-Connect Association?</div>
-
-		<div class="dnnFormItem dnnClear">
-		  [DNNLBL:STATIC:Yes, join:Check here if you want to join the association]
-		  [CTL:ROLEMEMBERSHIP:Association Member:Pending]
-		</div>
-
-		<div>
-			[RECAPTCHA:6LeT2vUSAAAAAK9YCM_6tQw3dbNUYnDVnEi4XEnQ]
-		</div>
 		<ul class="dnnActions">
 		  <li>[CTL:UPDATEBUTTON:CreateAccount]</li>
 		</ul>
diff --git a/View.ascx.vb b/View.ascx.vb
index 0188839..4c70527 100644
--- a/View.ascx.vb
+++ b/View.ascx.vb
@@ -255,14 +255,6 @@ Namespace Connect.Modules.UserManagement.AccountRegistration
             Dim txtLastName As TextBox = CType(FindControlRecursive(plhRegister, plhRegister.ID & "_" & Constants.ControlId_Lastname), TextBox)
             blnUpdateLastname = (Not txtLastName Is Nothing)
 
-
-            If CompareFirstNameLastName AndAlso (blnUpdateFirstname And blnUpdateLastname) Then
-                If txtLastName.Text.ToLower.Trim = txtFirstName.Text.ToLower.Trim Then
-                    strMessages.Add("Error_LastnameLikeFirstname")
-                    AddErrorIndicator(Constants.User_Firstname, plhRegister)
-                End If
-            End If
-
             If blnUpdateLastname Then
                 If Not IsValidUserAttribute(Constants.User_Lastname, plhRegister) Then
                     strMessages.Add("Error_MissingLastname")
@@ -272,6 +264,13 @@ Namespace Connect.Modules.UserManagement.AccountRegistration
                 End If
             End If
 
+            If CompareFirstNameLastName AndAlso (blnUpdateFirstname And blnUpdateLastname) Then
+                If txtLastName.Text.ToLower.Trim = txtFirstName.Text.ToLower.Trim Then
+                    strMessages.Add("Error_LastnameLikeFirstname")
+                    AddErrorIndicator(Constants.User_Firstname, plhRegister)
+                End If
+            End If
+
             Dim txtDisplayName As TextBox = CType(FindControlRecursive(plhRegister, plhRegister.ID & "_" & Constants.ControlId_Displayname), TextBox)
             blnUpdateDisplayname = (Not txtDisplayName Is Nothing)