diff --git a/Resources.zip b/Resources.zip
index 6e5275a..5f1f5d0 100644
Binary files a/Resources.zip and b/Resources.zip differ
diff --git a/Templates/Default - Copy/Email.User.txt b/Templates/Default - Copy/Email.User.txt
deleted file mode 100644
index ada629e..0000000
--- a/Templates/Default - Copy/Email.User.txt	
+++ /dev/null
@@ -1,464 +0,0 @@
-
-<p>Dear [DISPLAYNAME],</p>
-<p>your user account on the website <strong>[PORTALNAME]</strong> has been created succesfully.</p>
-<p>It is adviseable to keep your registration details in a safe place in case you need it one day.</p>
-
-<h2>Details about your account</h2>
-<table>
-    <tr>
-        <td>Username:</td><td>[USERNAME]</td>
-    </tr>
-    <tr>
-        <td>Password:</td><td>[PASSWORD]</td>
-    </tr>     
-    <tr>
-        <td>E-Mail Adress:</td><td>[EMAIL]</td>
-    </tr>                           
-</table>
-
-<div style="margin-top: 20px;padding: 20px;border: 1px dashed #ccc;background-color: #eee;">
-    <a href="[USERURL]">Click to manage Account</a>
-</div>
-
-<p style="padding-top: 20px;">
-    Best wishes,<br />the team from [PORTALNAME]
-</p>
-<p>
-    [PORTALURL]
-</p>
-
-
-<p>Dear [DISPLAYNAME],</p>
-<p>your user account on the website <strong>[PORTALNAME]</strong> has been created succesfully.</p>
-<p>It is adviseable to keep your registration details in a safe place in case you need it one day.</p>
-
-<h2>Details about your account</h2>
-<table>
-    <tr>
-        <td>Username:</td><td>[USERNAME]</td>
-    </tr>
-    <tr>
-        <td>Password:</td><td>[PASSWORD]</td>
-    </tr>     
-    <tr>
-        <td>E-Mail Adress:</td><td>[EMAIL]</td>
-    </tr>                           
-</table>
-
-<div style="margin-top: 20px;padding: 20px;border: 1px dashed #ccc;background-color: #eee;">
-    <a href="[USERURL]">Click to manage Account</a>
-</div>
-
-<p style="padding-top: 20px;">
-    Best wishes,<br />the team from [PORTALNAME]
-</p>
-<p>
-    [PORTALURL]
-</p>
-
-
-<p>Dear [DISPLAYNAME],</p>
-<p>your user account on the website <strong>[PORTALNAME]</strong> has been created succesfully.</p>
-<p>It is adviseable to keep your registration details in a safe place in case you need it one day.</p>
-
-<h2>Details about your account</h2>
-<table>
-    <tr>
-        <td>Username:</td><td>[USERNAME]</td>
-    </tr>
-    <tr>
-        <td>Password:</td><td>[PASSWORD]</td>
-    </tr>     
-    <tr>
-        <td>E-Mail Adress:</td><td>[EMAIL]</td>
-    </tr>                           
-</table>
-
-<div style="margin-top: 20px;padding: 20px;border: 1px dashed #ccc;background-color: #eee;">
-    <a href="[USERURL]">Click to manage Account</a>
-</div>
-
-<p style="padding-top: 20px;">
-    Best wishes,<br />the team from [PORTALNAME]
-</p>
-<p>
-    [PORTALURL]
-</p>
-
-
-<p>Dear [DISPLAYNAME],</p>
-<p>your user account on the website <strong>[PORTALNAME]</strong> has been created succesfully.</p>
-<p>It is adviseable to keep your registration details in a safe place in case you need it one day.</p>
-
-<h2>Details about your account</h2>
-<table>
-    <tr>
-        <td>Username:</td><td>[USERNAME]</td>
-    </tr>
-    <tr>
-        <td>Password:</td><td>[PASSWORD]</td>
-    </tr>     
-    <tr>
-        <td>E-Mail Adress:</td><td>[EMAIL]</td>
-    </tr>                           
-</table>
-
-<div style="margin-top: 20px;padding: 20px;border: 1px dashed #ccc;background-color: #eee;">
-    <a href="[USERURL]">Click to manage Account</a>
-</div>
-
-<p style="padding-top: 20px;">
-    Best wishes,<br />the team from [PORTALNAME]
-</p>
-<p>
-    [PORTALURL]
-</p>
-
-
-<p>Dear [DISPLAYNAME],</p>
-<p>your user account on the website <strong>[PORTALNAME]</strong> has been created succesfully.</p>
-<p>It is adviseable to keep your registration details in a safe place in case you need it one day.</p>
-
-<h2>Details about your account</h2>
-<table>
-    <tr>
-        <td>Username:</td><td>[USERNAME]</td>
-    </tr>
-    <tr>
-        <td>Password:</td><td>[PASSWORD]</td>
-    </tr>     
-    <tr>
-        <td>E-Mail Adress:</td><td>[EMAIL]</td>
-    </tr>                           
-</table>
-
-<div style="margin-top: 20px;padding: 20px;border: 1px dashed #ccc;background-color: #eee;">
-    <a href="[USERURL]">Click to manage Account</a>
-</div>
-
-<p style="padding-top: 20px;">
-    Best wishes,<br />the team from [PORTALNAME]
-</p>
-<p>
-    [PORTALURL]
-</p>
-
-
-<p>Dear [DISPLAYNAME],</p>
-<p>your user account on the website <strong>[PORTALNAME]</strong> has been created succesfully.</p>
-<p>It is adviseable to keep your registration details in a safe place in case you need it one day.</p>
-
-<h2>Details about your account</h2>
-<table>
-    <tr>
-        <td>Username:</td><td>[USERNAME]</td>
-    </tr>
-    <tr>
-        <td>Password:</td><td>[PASSWORD]</td>
-    </tr>     
-    <tr>
-        <td>E-Mail Adress:</td><td>[EMAIL]</td>
-    </tr>                           
-</table>
-
-<div style="margin-top: 20px;padding: 20px;border: 1px dashed #ccc;background-color: #eee;">
-    <a href="[USERURL]">Click to manage Account</a>
-</div>
-
-<p style="padding-top: 20px;">
-    Best wishes,<br />the team from [PORTALNAME]
-</p>
-<p>
-    [PORTALURL]
-</p>
-
-
-<p>Dear [DISPLAYNAME],</p>
-<p>your user account on the website <strong>[PORTALNAME]</strong> has been created succesfully.</p>
-<p>It is adviseable to keep your registration details in a safe place in case you need it one day.</p>
-
-<h2>Details about your account</h2>
-<table>
-    <tr>
-        <td>Username:</td><td>[USERNAME]</td>
-    </tr>
-    <tr>
-        <td>Password:</td><td>[PASSWORD]</td>
-    </tr>     
-    <tr>
-        <td>E-Mail Adress:</td><td>[EMAIL]</td>
-    </tr>                           
-</table>
-
-<div style="margin-top: 20px;padding: 20px;border: 1px dashed #ccc;background-color: #eee;">
-    <a href="[USERURL]">Click to manage Account</a>
-</div>
-
-<p style="padding-top: 20px;">
-    Best wishes,<br />the team from [PORTALNAME]
-</p>
-<p>
-    [PORTALURL]
-</p>
-
-
-<p>Dear [DISPLAYNAME],</p>
-<p>your user account on the website <strong>[PORTALNAME]</strong> has been created succesfully.</p>
-<p>It is adviseable to keep your registration details in a safe place in case you need it one day.</p>
-
-<h2>Details about your account</h2>
-<table>
-    <tr>
-        <td>Username:</td><td>[USERNAME]</td>
-    </tr>
-    <tr>
-        <td>Password:</td><td>[PASSWORD]</td>
-    </tr>     
-    <tr>
-        <td>E-Mail Adress:</td><td>[EMAIL]</td>
-    </tr>                           
-</table>
-
-<div style="margin-top: 20px;padding: 20px;border: 1px dashed #ccc;background-color: #eee;">
-    <a href="[USERURL]">Click to manage Account</a>
-</div>
-
-<p style="padding-top: 20px;">
-    Best wishes,<br />the team from [PORTALNAME]
-</p>
-<p>
-    [PORTALURL]
-</p>
-
-
-<p>Dear [DISPLAYNAME],</p>
-<p>your user account on the website <strong>[PORTALNAME]</strong> has been created succesfully.</p>
-<p>It is adviseable to keep your registration details in a safe place in case you need it one day.</p>
-
-<h2>Details about your account</h2>
-<table>
-    <tr>
-        <td>Username:</td><td>[USERNAME]</td>
-    </tr>
-    <tr>
-        <td>Password:</td><td>[PASSWORD]</td>
-    </tr>     
-    <tr>
-        <td>E-Mail Adress:</td><td>[EMAIL]</td>
-    </tr>                           
-</table>
-
-<div style="margin-top: 20px;padding: 20px;border: 1px dashed #ccc;background-color: #eee;">
-    <a href="[USERURL]">Click to manage Account</a>
-</div>
-
-<p style="padding-top: 20px;">
-    Best wishes,<br />the team from [PORTALNAME]
-</p>
-<p>
-    [PORTALURL]
-</p>
-
-
-<p>Dear [DISPLAYNAME],</p>
-<p>your user account on the website <strong>[PORTALNAME]</strong> has been created succesfully.</p>
-<p>It is adviseable to keep your registration details in a safe place in case you need it one day.</p>
-
-<h2>Details about your account</h2>
-<table>
-    <tr>
-        <td>Username:</td><td>[USERNAME]</td>
-    </tr>
-    <tr>
-        <td>Password:</td><td>[PASSWORD]</td>
-    </tr>     
-    <tr>
-        <td>E-Mail Adress:</td><td>[EMAIL]</td>
-    </tr>                           
-</table>
-
-<div style="margin-top: 20px;padding: 20px;border: 1px dashed #ccc;background-color: #eee;">
-    <a href="[USERURL]">Click to manage Account</a>
-</div>
-
-<p style="padding-top: 20px;">
-    Best wishes,<br />the team from [PORTALNAME]
-</p>
-<p>
-    [PORTALURL]
-</p>
-
-
-<p>Dear [DISPLAYNAME],</p>
-<p>your user account on the website <strong>[PORTALNAME]</strong> has been created succesfully.</p>
-<p>It is adviseable to keep your registration details in a safe place in case you need it one day.</p>
-
-<h2>Details about your account</h2>
-<table>
-    <tr>
-        <td>Username:</td><td>[USERNAME]</td>
-    </tr>
-    <tr>
-        <td>Password:</td><td>[PASSWORD]</td>
-    </tr>     
-    <tr>
-        <td>E-Mail Adress:</td><td>[EMAIL]</td>
-    </tr>                           
-</table>
-
-<div style="margin-top: 20px;padding: 20px;border: 1px dashed #ccc;background-color: #eee;">
-    <a href="[USERURL]">Click to manage Account</a>
-</div>
-
-<p style="padding-top: 20px;">
-    Best wishes,<br />the team from [PORTALNAME]
-</p>
-<p>
-    [PORTALURL]
-</p>
-
-
-<p>Dear [DISPLAYNAME],</p>
-<p>your user account on the website <strong>[PORTALNAME]</strong> has been created succesfully.</p>
-<p>It is adviseable to keep your registration details in a safe place in case you need it one day.</p>
-
-<h2>Details about your account</h2>
-<table>
-    <tr>
-        <td>Username:</td><td>[USERNAME]</td>
-    </tr>
-    <tr>
-        <td>Password:</td><td>[PASSWORD]</td>
-    </tr>     
-    <tr>
-        <td>E-Mail Adress:</td><td>[EMAIL]</td>
-    </tr>                           
-</table>
-
-<div style="margin-top: 20px;padding: 20px;border: 1px dashed #ccc;background-color: #eee;">
-    <a href="[USERURL]">Click to manage Account</a>
-</div>
-
-<p style="padding-top: 20px;">
-    Best wishes,<br />the team from [PORTALNAME]
-</p>
-<p>
-    [PORTALURL]
-</p>
-
-
-<p>Dear [DISPLAYNAME],</p>
-<p>your user account on the website <strong>[PORTALNAME]</strong> has been created succesfully.</p>
-<p>It is adviseable to keep your registration details in a safe place in case you need it one day.</p>
-
-<h2>Details about your account</h2>
-<table>
-    <tr>
-        <td>Username:</td><td>[USERNAME]</td>
-    </tr>
-    <tr>
-        <td>Password:</td><td>[PASSWORD]</td>
-    </tr>     
-    <tr>
-        <td>E-Mail Adress:</td><td>[EMAIL]</td>
-    </tr>                           
-</table>
-
-<div style="margin-top: 20px;padding: 20px;border: 1px dashed #ccc;background-color: #eee;">
-    <a href="[USERURL]">Click to manage Account</a>
-</div>
-
-<p style="padding-top: 20px;">
-    Best wishes,<br />the team from [PORTALNAME]
-</p>
-<p>
-    [PORTALURL]
-</p>
-
-
-<p>Dear [DISPLAYNAME],</p>
-<p>your user account on the website <strong>[PORTALNAME]</strong> has been created succesfully.</p>
-<p>It is adviseable to keep your registration details in a safe place in case you need it one day.</p>
-
-<h2>Details about your account</h2>
-<table>
-    <tr>
-        <td>Username:</td><td>[USERNAME]</td>
-    </tr>
-    <tr>
-        <td>Password:</td><td>[PASSWORD]</td>
-    </tr>     
-    <tr>
-        <td>E-Mail Adress:</td><td>[EMAIL]</td>
-    </tr>                           
-</table>
-
-<div style="margin-top: 20px;padding: 20px;border: 1px dashed #ccc;background-color: #eee;">
-    <a href="[USERURL]">Click to manage Account</a>
-</div>
-
-<p style="padding-top: 20px;">
-    Best wishes,<br />the team from [PORTALNAME]
-</p>
-<p>
-    [PORTALURL]
-</p>
-
-
-<p>Dear [DISPLAYNAME],</p>
-<p>your user account on the website <strong>[PORTALNAME]</strong> has been created succesfully.</p>
-<p>It is adviseable to keep your registration details in a safe place in case you need it one day.</p>
-
-<h2>Details about your account</h2>
-<table>
-    <tr>
-        <td>Username:</td><td>[USERNAME]</td>
-    </tr>
-    <tr>
-        <td>Password:</td><td>[PASSWORD]</td>
-    </tr>     
-    <tr>
-        <td>E-Mail Adress:</td><td>[EMAIL]</td>
-    </tr>                           
-</table>
-
-<div style="margin-top: 20px;padding: 20px;border: 1px dashed #ccc;background-color: #eee;">
-    <a href="[USERURL]">Click to manage Account</a>
-</div>
-
-<p style="padding-top: 20px;">
-    Best wishes,<br />the team from [PORTALNAME]
-</p>
-<p>
-    [PORTALURL]
-</p>
-
-
-<p>Dear [DISPLAYNAME],</p>
-<p>your user account on the website <strong>[PORTALNAME]</strong> has been created succesfully.</p>
-<p>It is adviseable to keep your registration details in a safe place in case you need it one day.</p>
-
-<h2>Details about your account</h2>
-<table>
-    <tr>
-        <td>Username:</td><td>[USERNAME]</td>
-    </tr>
-    <tr>
-        <td>Password:</td><td>[PASSWORD]</td>
-    </tr>     
-    <tr>
-        <td>E-Mail Adress:</td><td>[EMAIL]</td>
-    </tr>                           
-</table>
-
-<div style="margin-top: 20px;padding: 20px;border: 1px dashed #ccc;background-color: #eee;">
-    <a href="[USERURL]">Click to manage Account</a>
-</div>
-
-<p style="padding-top: 20px;">
-    Best wishes,<br />the team from [PORTALNAME]
-</p>
-<p>
-    [PORTALURL]
-</p>
-
diff --git a/Templates/Default - Copy/Form.txt b/Templates/Default - Copy/Form.txt
deleted file mode 100644
index b7341da..0000000
--- a/Templates/Default - Copy/Form.txt	
+++ /dev/null
@@ -1,102 +0,0 @@
-<div id="ConnectRegisterForm" class="dnnForm dnnClear">
-
-    <ul id="ConnectRegisterFormTabs" runat="Server" class="dnnAdminTabNav dnnClear">
-        <li><a href="#dvFormTemplate" class="connect_RegisterTabLink">[RESX:LOGIN:CreateAccountTab]</a></li>
-        <li><a href="#dvLoginTemplate" class="connect_LoginTabLink">[RESX:LOGIN:LoginTab]</a></li>
-    </ul>
-
-	<div id="dvFormTemplate" class="connect_register">
-		
-		<div class="dnnFormItem dnnClear">
-		  [DNNLBL:USER:Email:HideRequired]
-		  [CTL:USER:Email]
-		  [REQUIRED:USER:Email]
-		</div>
-
-		<div class="dnnFormItem dnnClear">
-		  [DNNLBL:USER:Firstname:HideRequired]
-		  [CTL:USER:Firstname]
-		  [REQUIRED:USER:Firstname]
-		</div>
-
-		<div class="dnnFormItem dnnClear">
-		  [DNNLBL:USER:Lastname:HideRequired]
-		  [CTL:USER:Lastname]
-		  [REQUIRED:USER:Lastname]
-		</div>
-
-		<div class="dnnFormItem dnnClear">
-		  [DNNLBL:USER:Password1:HideRequired]
-		  [CTL:USER:Password1]
-		  [REQUIRED:USER:Password1]
-		</div>
-
-		<div class="dnnFormItem dnnClear">
-		  [DNNLBL:USER:Password2:HideRequired]
-		  [CTL:USER:Password2]
-		  [REQUIRED:USER:Password2]
-		</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>
-
-		<ul class="dnnActions">
-		  <li>[CTL:UPDATEBUTTON:CreateAccount]</li>
-		</ul>
-
-	</div>
-
-		<div id="dvLoginTemplate" class="connect_login">
-
-
-		<div class="dnnFormItem dnnClear">
-		  [DNNLBL:LOGIN:Username]
-		  [CTL:LOGIN:Username]
-		</div>
-		
-		<div class="dnnFormItem dnnClear">
-		  [DNNLBL:LOGIN:Password]
-		  [CTL:LOGIN:Password]
-		</div>
-
-		<div class="dnnFormItem dnnClear">
-		  [DNNLBL:LOGIN:Remember]
-		  [CTL:LOGIN:Remember]
-		</div>
-		
-		<ul class="dnnActions">
-		  <li>[CTL:LOGINBUTTON:Login]</li>
-		  <li>[CTL:LOSTPASSWORDBUTTON:LostPassword]</li>
-		</ul>
-						
-
-	</div>
-</div>
-
-<script language="javascript" type="text/javascript">
-/*globals jQuery, window, Sys */
-(function ($, Sys) {
-
-    function setupFormSettings() {
-        $('#ConnectRegisterForm').dnnTabs();
-		$('.connect_LoginTabLink').click(function () {
-			$('#dvLoginTemplate > input.dnnPrimaryAction').focus();
-		});
-		$('.connect_RegisterTabLink').click(function () {
-			$('#dvFormTemplate > input.dnnPrimaryAction').focus();
-		});
-    }
-
-    $(document).ready(function () {
-        setupFormSettings();
-        Sys.WebForms.PageRequestManager.getInstance().add_endRequest(function () {
-            setupFormSettings();
-        });
-    });
-
-} (jQuery, window.Sys));
-</script>
\ No newline at end of file
diff --git a/obj/Release/Connect.Modules.AccountRegistration.dll b/obj/Release/Connect.Modules.AccountRegistration.dll
index 53acda8..85402a1 100644
Binary files a/obj/Release/Connect.Modules.AccountRegistration.dll and b/obj/Release/Connect.Modules.AccountRegistration.dll differ
diff --git a/obj/Release/Connect.Modules.AccountRegistration.pdb b/obj/Release/Connect.Modules.AccountRegistration.pdb
index 381ffb1..68535e0 100644
Binary files a/obj/Release/Connect.Modules.AccountRegistration.pdb and b/obj/Release/Connect.Modules.AccountRegistration.pdb differ
diff --git a/obj/Release/Connect.Modules.AccountRegistration.xml b/obj/Release/Connect.Modules.AccountRegistration.xml
index 2cfa7a3..5cb8dda 100644
--- a/obj/Release/Connect.Modules.AccountRegistration.xml
+++ b/obj/Release/Connect.Modules.AccountRegistration.xml
@@ -174,6 +174,22 @@ chkNotifyUser control.
 Auto-generated field.
 To modify move field declaration from designer file to code-behind file.
 </remarks>
+</member><member name="F:Connect.Modules.UserManagement.AccountRegistration.Settings.lblPrivateCaptchaKey">
+	<summary>
+lblPrivateCaptchaKey control.
+</summary>
+	<remarks>
+Auto-generated field.
+To modify move field declaration from designer file to code-behind file.
+</remarks>
+</member><member name="F:Connect.Modules.UserManagement.AccountRegistration.Settings.txtPrivateCaptchaKey">
+	<summary>
+txtPrivateCaptchaKey control.
+</summary>
+	<remarks>
+Auto-generated field.
+To modify move field declaration from designer file to code-behind file.
+</remarks>
 </member><member name="F:Connect.Modules.UserManagement.AccountRegistration.Settings.lblInterface">
 	<summary>
 lblInterface control.
diff --git a/obj/Release/Connect_AccountRegistration.vbprojResolveAssemblyReference.cache b/obj/Release/Connect_AccountRegistration.vbprojResolveAssemblyReference.cache
index 54b85a1..b252d46 100644
Binary files a/obj/Release/Connect_AccountRegistration.vbprojResolveAssemblyReference.cache and b/obj/Release/Connect_AccountRegistration.vbprojResolveAssemblyReference.cache differ