diff --git a/AssemblyInfo.vb b/AssemblyInfo.vb
index 88e979c..a3cd3a6 100644
--- a/AssemblyInfo.vb
+++ b/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("01.02.02")> 
-<Assembly: AssemblyFileVersion("01.02.02")> 
+<Assembly: AssemblyVersion("01.03.00")> 
+<Assembly: AssemblyFileVersion("01.03.00")> 
diff --git a/Connect_AccountRegistration.dnn b/Connect_AccountRegistration.dnn
index c26bf04..ac3bb22 100644
--- a/Connect_AccountRegistration.dnn
+++ b/Connect_AccountRegistration.dnn
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="Connect AccountRegistrationForm" type="Module" version="01.02.02">
+    <package name="Connect AccountRegistrationForm" type="Module" version="01.03.00">
       <friendlyName>Connect: AccountRegistration</friendlyName>
       <description>A community module that handles account registrations and login in DNN</description>
       <iconFile>Desktopmodules/Connect/AccountRegistration/Images/icnModule.png</iconFile>
@@ -27,6 +27,11 @@
               <name>01.00.00.SqlDataProvider</name>
               <version>01.00.00</version>
             </script>
+            <script type="Install">
+              <path>Providers\DataProviders\SqlDataProvider</path>
+              <name>01.03.00.SqlDataProvider</name>
+              <version>01.03.00</version>
+            </script>
             <script type="UnInstall">
               <path>Providers\DataProviders\SqlDataProvider</path>
               <name>Uninstall.SqlDataProvider</name>
diff --git a/Connect_AccountRegistration.vbproj b/Connect_AccountRegistration.vbproj
index a836ca5..e278cdb 100644
--- a/Connect_AccountRegistration.vbproj
+++ b/Connect_AccountRegistration.vbproj
@@ -139,16 +139,12 @@
     <None Include="BuildScripts\MSBuild.Community.Tasks.Targets" />
     <None Include="Connect_AccountRegistration.dnn" />
     <Content Include="Templates.ascx" />
-    <Content Include="Templates\Connect\Email.Admin.txt" />
-    <Content Include="Templates\Connect\Email.User.Private.txt" />
-    <Content Include="Templates\Connect\Email.User.txt" />
-    <Content Include="Templates\Connect\Email.User.Verified.txt" />
-    <Content Include="Templates\Connect\Form.txt" />
     <Content Include="Templates\Default\Email.Admin.txt" />
     <Content Include="Templates\Default\Email.User.Private.txt" />
     <Content Include="Templates\Default\Email.User.txt" />
     <Content Include="Templates\Default\Email.User.Verified.txt" />
     <None Include="Providers\DataProviders\SqlDataProvider\01.00.00.SqlDataProvider" />
+    <Content Include="Providers\DataProviders\SqlDataProvider\01.03.00.SqlDataProvider" />
     <None Include="Providers\DataProviders\SqlDataProvider\Uninstall.SqlDataProvider" />
   </ItemGroup>
   <ItemGroup>
@@ -178,7 +174,7 @@
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
         <WebProjectProperties>
-          <UseIIS>True</UseIIS>
+          <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>62597</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
diff --git a/Providers/DataProviders/SqlDataProvider/01.03.00.SqlDataProvider b/Providers/DataProviders/SqlDataProvider/01.03.00.SqlDataProvider
new file mode 100644
index 0000000..5b115a3
--- /dev/null
+++ b/Providers/DataProviders/SqlDataProvider/01.03.00.SqlDataProvider
@@ -0,0 +1,445 @@
+-- no longer needed
+
+if exists (select * from dbo.sysobjects where id = object_id(N'{databaseOwner}[{objectQualifier}Connect_Accounts_GetUsers]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
+    drop procedure {databaseOwner}[{objectQualifier}Connect_Accounts_GetUsers]
+GO
+
+if exists (select * from dbo.sysobjects where id = object_id(N'{databaseOwner}[{objectQualifier}Connect_GetUserList]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
+    drop procedure {databaseOwner}[{objectQualifier}Connect_GetUserList]
+GO
+
+if exists (select * from dbo.sysobjects where id = object_id(N'{databaseOwner}[{objectQualifier}Connect_Accounts_SearchUsers]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
+    drop procedure {databaseOwner}[{objectQualifier}Connect_Accounts_SearchUsers]
+GO
+
+-- delete fro re-creation
+
+if exists (select * from dbo.sysobjects where id = object_id(N'{databaseOwner}[{objectQualifier}Connect_Accounts_GetRegisteredUsers]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
+    drop procedure {databaseOwner}[{objectQualifier}Connect_Accounts_GetRegisteredUsers]
+GO
+
+if exists (select * from dbo.sysobjects where id = object_id(N'{databaseOwner}[{objectQualifier}Connect_Accounts_GetRoleMembers]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
+    drop procedure {databaseOwner}[{objectQualifier}Connect_Accounts_GetRoleMembers]
+GO
+
+if exists (select * from dbo.sysobjects where id = object_id(N'{databaseOwner}[{objectQualifier}Connect_Accounts_SearchRegisteredUsers]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
+    drop procedure {databaseOwner}[{objectQualifier}Connect_Accounts_SearchRegisteredUsers]
+GO
+
+if exists (select * from dbo.sysobjects where id = object_id(N'{databaseOwner}[{objectQualifier}Connect_Accounts_SearchRoleMembers]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
+    drop procedure {databaseOwner}[{objectQualifier}Connect_Accounts_SearchRoleMembers]
+GO
+
+if exists (select * from dbo.sysobjects where id = object_id(N'{databaseOwner}[{objectQualifier}Connect_Accounts_GetDeletedAccounts]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
+    drop procedure {databaseOwner}[{objectQualifier}Connect_Accounts_GetDeletedAccounts]
+GO
+
+if exists (select * from dbo.sysobjects where id = object_id(N'{databaseOwner}[{objectQualifier}Connect_Accounts_GetSuperUsers]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
+    drop procedure {databaseOwner}[{objectQualifier}Connect_Accounts_GetSuperUsers]
+GO
+
+if exists (select * from dbo.sysobjects where id = object_id(N'{databaseOwner}[{objectQualifier}Connect_Accounts_SearchDeletedUsers]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
+    drop procedure {databaseOwner}[{objectQualifier}Connect_Accounts_SearchDeletedUsers]
+GO
+
+if exists (select * from dbo.sysobjects where id = object_id(N'{databaseOwner}[{objectQualifier}vw_Connect_Users]') and OBJECTPROPERTY(id, N'IsView') = 1)
+    drop View {databaseOwner}[{objectQualifier}vw_Connect_Users]
+GO
+
+CREATE VIEW {databaseOwner}[{objectQualifier}vw_Connect_Users]
+AS
+
+		WITH ProfileProperties (_uid, PropertyName, PropertyValue) 
+		AS 
+			( 
+				SELECT up.UserID as _uid, PropertyName, up.PropertyValue 
+				FROM {databaseOwner}[{objectQualifier}UserProfile] UP
+				INNER JOIN {databaseOwner}[{objectQualifier}ProfilePropertyDefinition] PPD ON UP.PropertyDefinitionID = PPD.PropertyDefinitionID 
+			) 
+	
+			SELECT DISTINCT
+				 X.UserId,
+				 X.Username,
+				 X.FirstName,
+				 X.LastName,
+				 X.DisplayName,
+				 X.Email,
+			    UP.PortalId,
+				 X.Street,
+				 X.Unit,
+				 X.PostalCode,
+				 X.City,
+				 X.Country,
+				 X.Region,
+				 X.Telephone,
+				 X.Cell,
+				 X.TimeZone,
+				 X.Photo,
+				 X.PreferredLocale,
+				 X.PreferredTimeZone,
+				 X.IsSuperUser,
+				UP.IsDeleted,
+				AM.LastLoginDate
+			FROM 
+				{databaseOwner}[{objectQualifier}Users] U 
+				INNER JOIN ProfileProperties PP ON U.UserID = PP._uid 
+				PIVOT (MAX(PropertyValue) FOR PP.PropertyName IN ( [Unit], [Street], [City], [Region], [Country], [PostalCode], [Telephone], [Cell], [TimeZone], [PreferredLocale], [PreferredTimeZone], [Photo])) X 
+				INNER JOIN {databaseOwner}[aspnet_Users] AU ON AU.UserName = X.Username
+				INNER JOIN {databaseOwner}[aspnet_Membership] AM ON am.UserId = AU.UserId 
+				LEFT JOIN {databaseOwner}[{objectQualifier}UserPortals] UP 
+					ON CASE WHEN X.IsSuperuser = 1 THEN 0 ELSE X.UserId END = UP.UserId
+
+GO
+
+
+Create PROCEDURE {databaseOwner}[{objectQualifier}Connect_Accounts_GetRoleMembers]
+	@RoleId int,
+	@PortalId int
+AS
+SELECT DISTINCT
+	U.UserId,
+	U.Username,
+	U.FirstName,
+	U.LastName,
+	U.DisplayName,
+	U.Email,
+	U.Street,
+	U.Unit,
+	U.PostalCode,
+	U.City,
+	U.Country,	
+	U.Region,	
+	U.Telephone,
+	U.Cell,
+	U.PreferredTimeZone,
+	U.TimeZone,
+	U.PreferredLocale,
+	U.IsDeleted,
+	U.IsSuperUser,
+	UR.Status as 'Status',
+	UR.RoleID as 'RoleId',
+	U.LastLoginDate,		
+	UR.CreatedOnDate as 'CreatedDate'	
+FROM
+	{databaseOwner}{objectQualifier}vw_Connect_Users U
+	Inner Join {databaseOwner}[{objectQualifier}UserRoles] UR on UR.UserId = U.UserID
+WHERE
+	UR.RoleID = @RoleId
+AND
+	U.IsDeleted = 0
+AND
+	U.IsSuperUser = 0
+AND
+	U.PortalId = @PortalId
+
+GO
+
+CREATE PROCEDURE {databaseOwner}[{objectQualifier}Connect_Accounts_GetSuperUsers]
+	@RoleId int
+AS
+SELECT DISTINCT
+	U.UserId,
+	U.Username,
+	U.FirstName,
+	U.LastName,
+	U.DisplayName,
+	U.Email,
+	U.Street,
+	U.Unit,
+	U.PostalCode,
+	U.City,
+	U.Country,	
+	U.Region,	
+	U.Telephone,
+	U.Cell,
+	U.PreferredTimeZone,
+	U.TimeZone,
+	U.PreferredLocale,
+	U.IsDeleted,
+	U.IsSuperUser,
+	UP.Authorised as 'Status',
+	(Select @RoleId) as 'RoleId',
+	U.LastLoginDate,		
+	UP.CreatedDate as 'CreatedDate'	
+FROM
+	{databaseOwner}{objectQualifier}vw_Connect_Users U
+	Inner Join {databaseOwner}[{objectQualifier}UserPortals] UP on U.UserId = UP.UserId
+WHERE
+	U.IsDeleted = 0
+AND
+	U.IsSuperUser = 1
+GO
+
+CREATE PROCEDURE {databaseOwner}[{objectQualifier}Connect_Accounts_GetDeletedAccounts]
+	@RoleId int,
+	@PortalId int
+AS
+SELECT DISTINCT
+	U.UserId,
+	U.Username,
+	U.FirstName,
+	U.LastName,
+	U.DisplayName,
+	U.Email,
+	U.Street,
+	U.Unit,
+	U.PostalCode,
+	U.City,
+	U.Country,	
+	U.Region,	
+	U.Telephone,
+	U.Cell,
+	U.PreferredTimeZone,
+	U.TimeZone,
+	U.PreferredLocale,
+	U.IsDeleted,
+	U.IsSuperUser,
+	UP.Authorised as 'Status',
+	(Select @RoleId) as 'RoleId',
+	U.LastLoginDate,		
+	UP.CreatedDate as 'CreatedDate'	
+FROM
+	{databaseOwner}{objectQualifier}vw_Connect_Users U
+	Inner Join {databaseOwner}[{objectQualifier}UserPortals] UP on U.UserId = UP.UserId
+WHERE
+	UP.PortalId = @PortalId
+AND
+	U.IsDeleted = 1
+AND
+	U.IsSuperUser = 0
+GO
+
+
+CREATE PROCEDURE {databaseOwner}[{objectQualifier}Connect_Accounts_GetRegisteredUsers]
+	@RoleId int,
+	@PortalId int
+AS
+SELECT DISTINCT
+	U.UserId,
+	U.Username,
+	U.FirstName,
+	U.LastName,
+	U.DisplayName,
+	U.Email,
+	U.Street,
+	U.Unit,
+	U.PostalCode,
+	U.City,
+	U.Country,	
+	U.Region,	
+	U.Telephone,
+	U.Cell,
+	U.PreferredTimeZone,
+	U.TimeZone,
+	U.PreferredLocale,
+	U.IsDeleted,
+	U.IsSuperUser,
+	UP.Authorised as 'Status',
+	(Select @RoleId) as 'RoleId',
+	U.LastLoginDate,		
+	UP.CreatedDate as 'CreatedDate'	
+FROM
+	{databaseOwner}{objectQualifier}vw_Connect_Users U
+	Inner Join {databaseOwner}[{objectQualifier}UserPortals] UP on U.UserId = UP.UserId
+WHERE
+	UP.PortalId = @PortalId
+AND
+	U.IsDeleted = 0
+AND
+	U.IsSuperUser = 0
+GO
+
+CREATE PROCEDURE {databaseOwner}[{objectQualifier}Connect_Accounts_SearchDeletedUsers]
+	@RoleId int,
+	@PortalId int,
+	@SearchText nvarchar(256),
+	@SearchCols nvarchar(256)
+AS
+SELECT DISTINCT
+	U.UserId,
+	U.Username,
+	U.FirstName,
+	U.LastName,
+	U.DisplayName,
+	U.Email,
+	U.Street,
+	U.Unit,
+	U.PostalCode,
+	U.City,
+	U.Country,	
+	U.Region,	
+	U.Telephone,
+	U.Cell,
+	U.PreferredTimeZone,
+	U.TimeZone,
+	U.PreferredLocale,
+	U.IsDeleted,
+	U.IsSuperUser,
+	'' as 'Status',
+	(Select @RoleId) as 'RoleId',
+	U.LastLoginDate,		
+	USRP.CreatedDate as 'CreatedDate'		
+FROM
+	{databaseOwner}[{objectQualifier}UserProfile] UP
+	INNER JOIN {databaseOwner}[{objectQualifier}ProfilePropertyDefinition] PD on PD.[PropertyDefinitionID] = UP.[PropertyDefinitionID]
+	INNER JOIN {databaseOwner}[{objectQualifier}vw_Connect_Users] U on U.UserId = UP.UserID
+	Inner Join {databaseOwner}[{objectQualifier}UserPortals] USRP on U.UserId = USRP.UserId
+WHERE
+	U.PortalId = @PortalId
+AND
+	U.IsDeleted = 1
+AND
+	U.IsSuperUser = 0
+AND
+	(
+		(UP.[PropertyValue] Like '%' + @SearchText + '%' And (PatIndex('%' + PD.[PropertyName] + '%' , @SearchCols) > 0))
+
+		OR
+		(
+				(U.[FirstName] Like '%' + @SearchText + '%' and PATINDEX('%FirstName%', @SearchCols) > 0)
+				OR
+				(U.[LastName] Like '%' + @SearchText + '%' and PATINDEX('%LastName%', @SearchCols) > 0)		
+				OR
+				(U.[DisplayName] Like '%' + @SearchText + '%' and PATINDEX('%DisplayName%', @SearchCols) > 0)				
+				OR
+				(U.[Email] Like '%' + @SearchText + '%' and PATINDEX('%Email%', @SearchCols) > 0)						
+				OR
+				(U.[Username] Like '%' + @SearchText + '%' and PATINDEX('%Username%', @SearchCols) > 0)	
+		)
+
+	)
+
+GO
+
+CREATE PROCEDURE {databaseOwner}[{objectQualifier}Connect_Accounts_SearchRoleMembers]
+	@RoleId int,
+	@SearchText nvarchar(256),
+	@SearchCols nvarchar(256)
+AS
+SELECT DISTINCT
+	U.UserId,
+	U.Username,
+	U.FirstName,
+	U.LastName,
+	U.DisplayName,
+	U.Email,
+	U.Street,
+	U.Unit,
+	U.PostalCode,
+	U.City,
+	U.Country,	
+	U.Region,	
+	U.Telephone,
+	U.Cell,
+	U.PreferredTimeZone,
+	U.TimeZone,
+	U.PreferredLocale,
+	U.IsDeleted,
+	U.IsSuperUser,
+	UR.Status as 'Status',
+	UR.RoleID as 'RoleId',
+	U.LastLoginDate,		
+	UR.CreatedOnDate as 'CreatedDate'		
+FROM
+	{databaseOwner}[{objectQualifier}UserProfile] UP
+	INNER JOIN {databaseOwner}[{objectQualifier}ProfilePropertyDefinition] PD on PD.[PropertyDefinitionID] = UP.[PropertyDefinitionID]
+	INNER JOIN {databaseOwner}[{objectQualifier}vw_Connect_Users] U on U.UserId = UP.UserID
+	Inner Join {databaseOwner}[{objectQualifier}UserRoles] UR on UR.UserId = U.UserID
+WHERE
+	UR.RoleID = @RoleId
+AND
+	U.IsDeleted = 0
+AND
+	U.IsSuperUser = 0
+AND
+	(
+		(UP.[PropertyValue] Like '%' + @SearchText + '%' And (PatIndex('%' + PD.[PropertyName] + '%' , @SearchCols) > 0))
+
+		OR
+		(
+				(U.[FirstName] Like '%' + @SearchText + '%' and PATINDEX('%FirstName%', @SearchCols) > 0)
+				OR
+				(U.[LastName] Like '%' + @SearchText + '%' and PATINDEX('%LastName%', @SearchCols) > 0)		
+				OR
+				(U.[DisplayName] Like '%' + @SearchText + '%' and PATINDEX('%DisplayName%', @SearchCols) > 0)				
+				OR
+				(U.[Email] Like '%' + @SearchText + '%' and PATINDEX('%Email%', @SearchCols) > 0)						
+				OR
+				(U.[Username] Like '%' + @SearchText + '%' and PATINDEX('%Username%', @SearchCols) > 0)	
+		)
+
+	)
+
+GO
+
+CREATE PROCEDURE {databaseOwner}[{objectQualifier}Connect_Accounts_SearchRegisteredUsers]
+	@RoleId int,
+	@PortalId int,
+	@SearchText nvarchar(256),
+	@SearchCols nvarchar(256)
+AS
+SELECT DISTINCT
+	U.UserId,
+	U.Username,
+	U.FirstName,
+	U.LastName,
+	U.DisplayName,
+	U.Email,
+	U.Street,
+	U.Unit,
+	U.PostalCode,
+	U.City,
+	U.Country,	
+	U.Region,	
+	U.Telephone,
+	U.Cell,
+	U.PreferredTimeZone,
+	U.TimeZone,
+	U.PreferredLocale,
+	U.IsDeleted,
+	U.IsSuperUser,
+	USRP.Authorised as 'Status',
+	(Select @RoleId) as 'RoleId',
+	U.LastLoginDate,		
+	USRP.CreatedDate as 'CreatedDate'	
+FROM
+	{databaseOwner}[{objectQualifier}UserProfile] UP
+	INNER JOIN {databaseOwner}[{objectQualifier}ProfilePropertyDefinition] PD on PD.[PropertyDefinitionID] = UP.[PropertyDefinitionID]
+	INNER JOIN {databaseOwner}[{objectQualifier}vw_Connect_Users] U on U.UserId = UP.UserID
+	INNER JOIN {databaseOwner}[{objectQualifier}UserPortals] USRP on U.UserId = USRP.UserId
+WHERE
+	USRP.PortalId = @PortalId
+AND
+	U.IsDeleted = 0
+AND
+	U.IsSuperUser = 0
+AND
+	(
+		(UP.[PropertyValue] Like '%' + @SearchText + '%' And (PatIndex('%' + PD.[PropertyName] + '%' , @SearchCols) > 0))
+
+		OR
+		(
+				(U.[FirstName] Like '%' + @SearchText + '%' and PATINDEX('%FirstName%', @SearchCols) > 0)
+				OR
+				(U.[LastName] Like '%' + @SearchText + '%' and PATINDEX('%LastName%', @SearchCols) > 0)		
+				OR
+				(U.[DisplayName] Like '%' + @SearchText + '%' and PATINDEX('%DisplayName%', @SearchCols) > 0)				
+				OR
+				(U.[Email] Like '%' + @SearchText + '%' and PATINDEX('%Email%', @SearchCols) > 0)						
+				OR
+				(U.[Username] Like '%' + @SearchText + '%' and PATINDEX('%Username%', @SearchCols) > 0)	
+		)
+
+	)
+
+GO
+
+
+if not exists (select 1 from {databaseOwner}[{objectQualifier}Lists] where ListName='DataType' and Value='CheckboxList')
+begin
+	INSERT INTO {databaseOwner}[{objectQualifier}Lists] ([ListName],[Value],[Text],
+		[ParentID],[Level],[SortOrder],[DefinitionID],[PortalID],[SystemList])
+	VALUES('DataType','CheckboxList','Connect.Libraries.UserManagement.CheckboxListEditControl, Connect.Libraries.UserManagement',
+		0,0,0,-1,-1,1)
+end
+GO
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 583af00..f8e6e7e 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -6,7 +6,23 @@
 </p>
 <hr/>
 <div class="License">
+	
 	<h3>Release Notes</h3>
+
+	<p class="Owner">
+		<b>Version 01.03.00</b>
+	</p>
+	<p>Major Release</p>
+	
+	<ul>
+		<li>New: New Checkboxlist control for profile properties</li>
+		<li>New: Interface for handling pre-registration event</li>
+		<li>Enhancement: Customize messages displayed on screen after registration</li>
+		<li>Enhancement: Cross-browser support for pressing enter on registration and signup form</li>
+	</ul>
+	<p><a href="https://github.com/DNN-Connect/UserAccountRegistration/issues?q=milestone%3A01.03.00+is%3Aclosed" target="_blank">Full change log</a></p>
+	<p>Thanks to <a href="https://github.com/vmasanas" target="_blank">Vicenç Masanas</a> for contributing</p>
+
 	<p class="Owner">
 		<b>Version 01.02.02</b>
 	</p>
diff --git a/Resources.zip b/Resources.zip
deleted file mode 100644
index 8dfc779..0000000
Binary files a/Resources.zip and /dev/null differ
diff --git a/Templates/DNN-Connect/Email.Admin.txt b/Templates/DNN-Connect/Email.Admin.txt
deleted file mode 100644
index ce54754..0000000
--- a/Templates/DNN-Connect/Email.Admin.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-
-<html>
-<head>
-    <title>[TITLE]</title>
-    <style type="text/css">
-        body {margin:10px;background-color:#eee}
-        html, body, *, a, a:link, a:active, a:visited, div, p, span, li { font-family: Arial, helvetica, Sans-Serif; font-size: 14px;}
-        h1,h2,h3,h4,h5,h6 {font-family: Arial, helvetica, Sans-Serif;}
-        a, a:link, a:active, a:visited {color:#47292B; text-decoration:none!important;}
-        a:hover {text-decoration:underline!important;}
-        .footer a {color:#fff}
-        h1 {font-size: 150px;}
-        h2 {font-size: 80px;}
-        h3 { font-size: 30px; }
-        h4 {font-size: 24px;}
-        h5 {font-size: 18px;}
-        h6 {font-size: 14px;}
-        .header { height:63px; background-color: #47292B; color:#fff }
-        .content { min-height: 537px; background-color: #FF7307; color:#fff; }
-        .footer { background-color:#00A3E4;color:#000; }
-    </style>
-</head>
-<body>
-    <div style="padding:40px;">
-
-        
-    <table style="width:600px; margin-left:auto; margin-right:auto; border-collapse:collapse;" align="center" Width="600" >
-        <tr class="content">
-            <td colspan="2" style="padding: 10px;">
-                <span style="font-family: Arial, helvetica, Sans-Serif; font-size: 10px; font-weight: bold; color: #333;">dnn-connect account service</span>
-            </td>
-        </tr>
-        <tr class="header" style="height:63px; background-color: #47292B; color:#fff">
-            <td style="width:250px;"><img style="padding:5px;" src="http://dnn-connect.org/Portals/0/Images/logo.png" alt="DNN-Connect" /></td>
-            <td style="width:350px;"><span style="font-family: Arial, helvetica, Sans-Serif; font-size: 30px;">&nbsp;</span></td>
-        </tr>
-        <tr class="content" style=" min-height: 537px; background-color: #FF7307; color:#fff; ">
-            <td colspan="2" style="padding: 10px;">
-
-
-                <p style="font-family: Arial, helvetica, Sans-Serif; font-size: 14px; font-weight: normal; color: #333;">
-                     A new account has been created at dnn-connect.org. The registration mode of the portal is set to <strong><i>[REGISTRATIONMODE]</i></strong>, so the following action is necessary:
-                </p>
-
-                <ul>
-                    <li style="font-family: Arial, helvetica, Sans-Serif; font-size: 14px; font-weight: normal; color: #333;">[ADMINACTION]</li>
-                </ul>
-               
-                <p style="font-family: Arial, helvetica, Sans-Serif; font-size: 14px; font-weight: bold; color: #333;">  
-                    << [FIRSTNAME] [LASTNAME], [EMAIL] >>
-                </p>
-
-                <p style="font-family: Arial, helvetica, Sans-Serif; font-size: 14px; font-weight: normal; color: #333;">
-                    <a href="[USERURL]" style="font-family: Arial, helvetica, Sans-Serif; font-size: 14px; font-weight: normal; color: #333;">Click to manage account</a>
-                </p>
-
-            </td>
-        </tr>
-        <tr class="footer" style="background-color:#00A3E4;color:#000;">
-            <td colspan="2">
-                <table cellpadding="5" cellspacing="0" style="border-collapse:collapse; margin-left:auto;margin-right:auto" align="center">
-                    <tr height="36">
-                        <td><img src="http://dnn-connect.org/portals/_default/skins/connect/images/globe.png" width="24" /></td>
-                        <td><a href="http://dnn-connect.org" style="font-family: Arial, helvetica, Sans-Serif; font-size: 12px; color: #fff;">dnn-connect.org</a></td>
-                        <td width="20">&nbsp;</td>
-                        <td><img src="http://dnn-connect.org/portals/_default/skins/connect/images/logo_tw.png" width="24" /></td>
-                        <td><a href="https://twitter.com/dnnConnect" style="font-family: Arial, helvetica, Sans-Serif; font-size: 12px; color: #fff;">@dnnConnect</a></td>
-                        <td width="20">&nbsp;</td>
-                        <td><img src="http://dnn-connect.org/portals/_default/skins/connect/images/logo_fb.png" width="24" /></td>
-                        <td><a href="https://www.facebook.com/dnnConnect" style="font-family: Arial, helvetica, Sans-Serif; font-size: 12px; color: #fff;">fb:dnnconnect</a></td>
-                    </tr>
-                </table>
-            </td>
-        </tr>
-    </table>
-    </div>
-</body>
-</html>
\ No newline at end of file
diff --git a/Templates/DNN-Connect/Email.User.Private.txt b/Templates/DNN-Connect/Email.User.Private.txt
deleted file mode 100644
index b12d917..0000000
--- a/Templates/DNN-Connect/Email.User.Private.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-
-<p>Dear [DISPLAYNAME],</p>
-<p>your user account on the website <strong>[PORTALNAME]</strong> has been created succesfully. In order to log on to your account you will have to wait until we have verified your account details and activate your account. This may take up to 24 hours and you will receive another notification e-mail as soon as this process has been finished.</p>
-
-<p>For now it is already 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>
-
-<p style="padding-top:20px;">
-    Once we have activated your account you can use the following link to manage your account details:
-</p>
-
-<div style="margin-top: 20px;padding: 20px;border: 1px dashed #ccc;background-color: #eee;">
-    <a href="[USERURL]">Click to manage Account</a>
-</div>
-    
-
diff --git a/Templates/DNN-Connect/Email.User.Verified.txt b/Templates/DNN-Connect/Email.User.Verified.txt
deleted file mode 100644
index 4797b7b..0000000
--- a/Templates/DNN-Connect/Email.User.Verified.txt
+++ /dev/null
@@ -1,87 +0,0 @@
-
-<html>
-<head>
-    <title>[TITLE]</title>
-    <style type="text/css">
-        body {margin:10px;background-color:#eee}
-        html, body, *, a, a:link, a:active, a:visited, div, p, span, li { font-family: Arial, helvetica, Sans-Serif; font-size: 14px;}
-        h1,h2,h3,h4,h5,h6 {font-family: Arial, helvetica, Sans-Serif;}
-        a, a:link, a:active, a:visited {color:#47292B; text-decoration:none!important;}
-        a:hover {text-decoration:underline!important;}
-        .footer a {color:#fff}
-        h1 {font-size: 150px;}
-        h2 {font-size: 80px;}
-        h3 { font-size: 30px; }
-        h4 {font-size: 24px;}
-        h5 {font-size: 18px;}
-        h6 {font-size: 14px;}
-        .header { height:63px; background-color: #47292B; color:#fff }
-        .content { min-height: 537px; background-color: #FF7307; color:#fff; }
-        .footer { background-color:#00A3E4;color:#000; }
-    </style>
-</head>
-<body>
-    <div style="padding:40px;">
-
-        
-    <table style="width:600px; margin-left:auto; margin-right:auto; border-collapse:collapse;" align="center" Width="600" >
-        <tr class="content">
-            <td colspan="2" style="padding: 10px;">
-                <span style="font-family: Arial, helvetica, Sans-Serif; font-size: 10px; font-weight: bold; color: #333;">dnn-connect account service</span>
-            </td>
-        </tr>
-        <tr class="header" style="height:63px; background-color: #47292B; color:#fff">
-            <td style="width:250px;"><img style="padding:5px;" src="http://dnn-connect.org/Portals/0/Images/logo.png" alt="DNN-Connect" /></td>
-            <td style="width:350px;"><span style="font-family: Arial, helvetica, Sans-Serif; font-size: 30px;">&nbsp;</span></td>
-        </tr>
-        <tr class="content" style=" min-height: 537px; background-color: #FF7307; color:#fff; ">
-            <td colspan="2" style="padding: 10px;">
-
-
-                <p style="font-family: Arial, helvetica, Sans-Serif; font-size: 14px; font-weight: normal; color: #333;">Dear [DISPLAYNAME],</p>
-
-                <p style="font-family: Arial, helvetica, Sans-Serif; font-size: 14px; font-weight: normal; color: #333;">
-                    we re pleased to inform you that your new account at dnn-connect.org has been created sucessfully.
-                </p>
-                <p style="font-family: Arial, helvetica, Sans-Serif; font-size: 14px; font-weight: normal; color: #333;">
-                    You may login in the future by providing your e-mail address and the selected password. Note that since we do not store your password in a way that we can actually read it 
-                    we cannot send you details about your password. You may reset your password anytime though by using the password reset facilities on the login form of our website.
-                </p>
-                
-                <p style="font-family: Arial, helvetica, Sans-Serif; font-size: 14px; font-weight: bold; color: #333;">  
-                    In order to reset your password later, you must have access to this e-mail account!
-                </p>
-
-                <p style="font-family: Arial, helvetica, Sans-Serif; font-size: 14px; font-weight: normal; color: #333;">
-                    The e-mail account you have signed up with is
-                </p>
-                <p style="font-family: Arial, helvetica, Sans-Serif; font-size: 14px; font-weight: bold; color: #333;">  
-                    << [EMAIL] >>
-                </p>
-                <p style="font-family: Arial, helvetica, Sans-Serif; font-size: 14px; font-weight: normal; color: #333;">
-                    Thank you for joing dnn-connect.org<br />
-                    We appreciate your support.
-                </p>
-
-            </td>
-        </tr>
-        <tr class="footer" style="background-color:#00A3E4;color:#000;">
-            <td colspan="2">
-                <table cellpadding="5" cellspacing="0" style="border-collapse:collapse; margin-left:auto;margin-right:auto" align="center">
-                    <tr height="36">
-                        <td><img src="http://dnn-connect.org/portals/_default/skins/connect/images/globe.png" width="24" /></td>
-                        <td><a href="http://dnn-connect.org" style="font-family: Arial, helvetica, Sans-Serif; font-size: 12px; color: #fff;">dnn-connect.org</a></td>
-                        <td width="20">&nbsp;</td>
-                        <td><img src="http://dnn-connect.org/portals/_default/skins/connect/images/logo_tw.png" width="24" /></td>
-                        <td><a href="https://twitter.com/dnnConnect" style="font-family: Arial, helvetica, Sans-Serif; font-size: 12px; color: #fff;">@dnnConnect</a></td>
-                        <td width="20">&nbsp;</td>
-                        <td><img src="http://dnn-connect.org/portals/_default/skins/connect/images/logo_fb.png" width="24" /></td>
-                        <td><a href="https://www.facebook.com/dnnConnect" style="font-family: Arial, helvetica, Sans-Serif; font-size: 12px; color: #fff;">fb:dnnconnect</a></td>
-                    </tr>
-                </table>
-            </td>
-        </tr>
-    </table>
-    </div>
-</body>
-</html>
\ No newline at end of file
diff --git a/Templates/DNN-Connect/Email.User.txt b/Templates/DNN-Connect/Email.User.txt
deleted file mode 100644
index cc4a10f..0000000
--- a/Templates/DNN-Connect/Email.User.txt
+++ /dev/null
@@ -1,299 +0,0 @@
-<html>
-<head>
-    <title>Your account at dnn-connect.org</title>
-    <style type="text/css">
-        body {
-            margin: 10px;
-            background-color: #eee;
-        }
-
-        html, body, *, a, a:link, a:active, a:visited, div, p, span, li {
-            font-family: Arial, helvetica, Sans-Serif;
-            font-size: 14px;
-        }
-
-        h1, h2, h3, h4, h5, h6 {
-            font-family: Arial, helvetica, Sans-Serif;
-        }
-
-        a, a:link, a:active, a:visited {
-            color: #47292B;
-            text-decoration: none !important;
-        }
-
-            a:hover {
-                text-decoration: underline !important;
-            }
-
-        .footer a {
-            color: #fff;
-        }
-
-        h1 {
-            font-size: 150px;
-        }
-
-        h2 {
-            font-size: 80px;
-        }
-
-        h3 {
-            font-size: 30px;
-        }
-
-        h4 {
-            font-size: 24px;
-        }
-
-        h5 {
-            font-size: 18px;
-        }
-
-        h6 {
-            font-size: 14px;
-        }
-
-        .header {
-            height: 63px;
-            background-color: #47292B;
-            color: #fff;
-        }
-
-        .content {
-            min-height: 537px;
-            background-color: #FF7307;
-            color: #fff;
-        }
-
-        .footer {
-            background-color: #00A3E4;
-            color: #000;
-        }
-    </style>
-</head>
-<body>
-    <div style="padding:40px;">
-
-        <table style="width:600px; margin-left:auto; margin-right:auto; border-collapse:collapse;" align="center" width="600">
-            <tr class="content">
-                <td colspan="2" style="padding-top: 10px;padding-left: 20px; padding-bottom: 10px;">
-                    <span style="font-family: Arial, helvetica, Sans-Serif; font-size: 10px; font-weight: bold; color: #333;">dnn-connect account service</span>
-                </td>
-            </tr>
-            <tr class="header" style="height:63px; background-color: #47292B; color:#fff">
-                <td style="width:250px;padding-left: 20px;"><img style="padding:5px;" src="http://dnn-connect.org/Portals/0/dnn-connect_logo.png" alt="DNN-Connect" /></td>
-                <td style="width:350px;"><span style="font-family: Arial, helvetica, Sans-Serif; font-size: 30px;">&nbsp;</span></td>
-            </tr>
-            <tr class="content" style=" min-height: 537px; background-color: #ffffff; color:#333333; ">
-                <td colspan="2" style="padding: 20px; background-color: #ffffff;">  
-                    
-                    <!--Actual content starts here -->                  
-                    <p style="font-family: Arial, helvetica, Sans-Serif; font-size: 14px; font-weight: normal; color: #333;">Dear [DISPLAYNAME],</p>
-
-                    <p style="font-family: Arial, helvetica, Sans-Serif; font-size: 14px; font-weight: normal; color: #333;">
-                        we re pleased to inform you that your new account at dnn-connect.org has been created sucessfully.
-                    </p>
-                    <p style="font-family: Arial, helvetica, Sans-Serif; font-size: 14px; font-weight: normal; color: #333;">
-                        You may login in the future by providing your e-mail address and the selected password. Note that since we do not store your password in a way that we can actually read it
-                        we cannot send you details about your password. You may reset your password anytime though by using the password reset facilities on the login form of our website.
-                    </p>
-
-                    <p style="font-family: Arial, helvetica, Sans-Serif; font-size: 14px; font-weight: bold; color: #333;">
-                        In order to reset your password later, you must have access to this e-mail account!
-                    </p>
-
-                    <p style="font-family: Arial, helvetica, Sans-Serif; font-size: 14px; font-weight: normal; color: #333;">
-                        The e-mail account you have signed up with is
-                    </p>
-                    <p style="font-family: Arial, helvetica, Sans-Serif; font-size: 14px; font-weight: bold; color: #333;">
-                        << [EMAIL] >>
-                    </p>
-                    <p style="font-family: Arial, helvetica, Sans-Serif; font-size: 14px; font-weight: normal; color: #333;">
-                        Thank you for joinig dnn-connect.org<br />
-                        We appreciate your support.
-                    </p>
-
-                    <p>&nbsp;</p>
-                    <!-- content end -->
-
-                </td>
-            </tr>
-            <tr class="footer" style="background-color:#00A3E4;color:#000;">
-                <td colspan="2">
-                    <table cellpadding="5" cellspacing="0" style="border-collapse:collapse; margin-left:auto;margin-right:auto" align="center">
-                        <tr height="36">
-                            <td><img src="http://dnn-connect.org/portals/_default/skins/connect/images/globe.png" width="24" /></td>
-                            <td><a href="http://dnn-connect.org" style="font-family: Arial, helvetica, Sans-Serif; font-size: 12px; color: #fff;">dnn-connect.org</a></td>
-                            <td width="20">&nbsp;</td>
-                            <td><img src="http://dnn-connect.org/portals/_default/skins/connect/images/logo_tw.png" width="24" /></td>
-                            <td><a href="https://twitter.com/dnnConnect" style="font-family: Arial, helvetica, Sans-Serif; font-size: 12px; color: #fff;">@dnnConnect</a></td>
-                            <td width="20">&nbsp;</td>
-                            <td><img src="http://dnn-connect.org/portals/_default/skins/connect/images/logo_fb.png" width="24" /></td>
-                            <td><a href="https://www.facebook.com/dnnConnect" style="font-family: Arial, helvetica, Sans-Serif; font-size: 12px; color: #fff;">fb:dnnconnect</a></td>
-                        </tr>
-                        <tr height="36">
-                            <td colspan="8">
-                                <table cellpadding="5" cellspacing="0" style="border-collapse:collapse; margin-left:auto;margin-right:auto" align="center">
-                                    <tr>
-                                        <td><a href="[SITEURL]/My-Profile/My-Subscriptions/UserId/[RECIPIENTUSERID]" style="font-family: Arial, helvetica, Sans-Serif; font-size: 12px; color: #fff;">Manage your Subscriptions</a></td>
-                                        <td><a href="[SITEURL]/My-Profile/My-Messages/UserId/[RECIPIENTUSERID]" style="font-family: Arial, helvetica, Sans-Serif; font-size: 12px; color: #fff;">My Messages</a></td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-                </td>
-            </tr>
-        </table>
-    </div>
-</body>
-</html><html>
-<head>
-    <title>Your account at dnn-connect.org</title>
-    <style type="text/css">
-        body {
-            margin: 10px;
-            background-color: #eee;
-        }
-
-        html, body, *, a, a:link, a:active, a:visited, div, p, span, li {
-            font-family: Arial, helvetica, Sans-Serif;
-            font-size: 14px;
-        }
-
-        h1, h2, h3, h4, h5, h6 {
-            font-family: Arial, helvetica, Sans-Serif;
-        }
-
-        a, a:link, a:active, a:visited {
-            color: #47292B;
-            text-decoration: none !important;
-        }
-
-            a:hover {
-                text-decoration: underline !important;
-            }
-
-        .footer a {
-            color: #fff;
-        }
-
-        h1 {
-            font-size: 150px;
-        }
-
-        h2 {
-            font-size: 80px;
-        }
-
-        h3 {
-            font-size: 30px;
-        }
-
-        h4 {
-            font-size: 24px;
-        }
-
-        h5 {
-            font-size: 18px;
-        }
-
-        h6 {
-            font-size: 14px;
-        }
-
-        .header {
-            height: 63px;
-            background-color: #47292B;
-            color: #fff;
-        }
-
-        .content {
-            min-height: 537px;
-            background-color: #FF7307;
-            color: #fff;
-        }
-
-        .footer {
-            background-color: #00A3E4;
-            color: #000;
-        }
-    </style>
-</head>
-<body>
-    <div style="padding:40px;">
-
-        <table style="width:600px; margin-left:auto; margin-right:auto; border-collapse:collapse;" align="center" width="600">
-            <tr class="content">
-                <td colspan="2" style="padding-top: 10px;padding-left: 20px; padding-bottom: 10px;">
-                    <span style="font-family: Arial, helvetica, Sans-Serif; font-size: 10px; font-weight: bold; color: #333;">dnn-connect account service</span>
-                </td>
-            </tr>
-            <tr class="header" style="height:63px; background-color: #47292B; color:#fff">
-                <td style="width:250px;padding-left: 20px;"><img style="padding:5px;" src="http://dnn-connect.org/Portals/0/dnn-connect_logo.png" alt="DNN-Connect" /></td>
-                <td style="width:350px;"><span style="font-family: Arial, helvetica, Sans-Serif; font-size: 30px;">&nbsp;</span></td>
-            </tr>
-            <tr class="content" style=" min-height: 537px; background-color: #ffffff; color:#333333; ">
-                <td colspan="2" style="padding: 20px; background-color: #ffffff;">  
-                    
-                    <!--Actual content starts here -->                  
-                    <p style="font-family: Arial, helvetica, Sans-Serif; font-size: 14px; font-weight: normal; color: #333;">Dear [DISPLAYNAME],</p>
-
-                    <p style="font-family: Arial, helvetica, Sans-Serif; font-size: 14px; font-weight: normal; color: #333;">
-                        we re pleased to inform you that your new account at dnn-connect.org has been created sucessfully.
-                    </p>
-                    <p style="font-family: Arial, helvetica, Sans-Serif; font-size: 14px; font-weight: normal; color: #333;">
-                        You may login in the future by providing your e-mail address and the selected password. Note that since we do not store your password in a way that we can actually read it
-                        we cannot send you details about your password. You may reset your password anytime though by using the password reset facilities on the login form of our website.
-                    </p>
-
-                    <p style="font-family: Arial, helvetica, Sans-Serif; font-size: 14px; font-weight: bold; color: #333;">
-                        In order to reset your password later, you must have access to this e-mail account!
-                    </p>
-
-                    <p style="font-family: Arial, helvetica, Sans-Serif; font-size: 14px; font-weight: normal; color: #333;">
-                        The e-mail account you have signed up with is
-                    </p>
-                    <p style="font-family: Arial, helvetica, Sans-Serif; font-size: 14px; font-weight: bold; color: #333;">
-                        << [EMAIL] >>
-                    </p>
-                    <p style="font-family: Arial, helvetica, Sans-Serif; font-size: 14px; font-weight: normal; color: #333;">
-                        Thank you for joinig dnn-connect.org<br />
-                        We appreciate your support.
-                    </p>
-
-                    <p>&nbsp;</p>
-                    <!-- content end -->
-
-                </td>
-            </tr>
-            <tr class="footer" style="background-color:#00A3E4;color:#000;">
-                <td colspan="2">
-                    <table cellpadding="5" cellspacing="0" style="border-collapse:collapse; margin-left:auto;margin-right:auto" align="center">
-                        <tr height="36">
-                            <td><img src="http://dnn-connect.org/portals/_default/skins/connect/images/globe.png" width="24" /></td>
-                            <td><a href="http://dnn-connect.org" style="font-family: Arial, helvetica, Sans-Serif; font-size: 12px; color: #fff;">dnn-connect.org</a></td>
-                            <td width="20">&nbsp;</td>
-                            <td><img src="http://dnn-connect.org/portals/_default/skins/connect/images/logo_tw.png" width="24" /></td>
-                            <td><a href="https://twitter.com/dnnConnect" style="font-family: Arial, helvetica, Sans-Serif; font-size: 12px; color: #fff;">@dnnConnect</a></td>
-                            <td width="20">&nbsp;</td>
-                            <td><img src="http://dnn-connect.org/portals/_default/skins/connect/images/logo_fb.png" width="24" /></td>
-                            <td><a href="https://www.facebook.com/dnnConnect" style="font-family: Arial, helvetica, Sans-Serif; font-size: 12px; color: #fff;">fb:dnnconnect</a></td>
-                        </tr>
-                        <tr height="36">
-                            <td colspan="8">
-                                <table cellpadding="5" cellspacing="0" style="border-collapse:collapse; margin-left:auto;margin-right:auto" align="center">
-                                    <tr>
-                                        <td><a href="[SITEURL]/My-Profile/My-Subscriptions/UserId/[RECIPIENTUSERID]" style="font-family: Arial, helvetica, Sans-Serif; font-size: 12px; color: #fff;">Manage your Subscriptions</a></td>
-                                        <td><a href="[SITEURL]/My-Profile/My-Messages/UserId/[RECIPIENTUSERID]" style="font-family: Arial, helvetica, Sans-Serif; font-size: 12px; color: #fff;">My Messages</a></td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-                </td>
-            </tr>
-        </table>
-    </div>
-</body>
-</html>
\ No newline at end of file
diff --git a/Templates/DNN-Connect/Form.txt b/Templates/DNN-Connect/Form.txt
deleted file mode 100644
index 9872c72..0000000
--- a/Templates/DNN-Connect/Form.txt
+++ /dev/null
@@ -1,138 +0,0 @@
-<div id="ConnectRegisterForm" class="dnnForm clearfix">
-
-    <ul id="ConnectRegisterFormTabs" runat="Server" class="dnnAdminTabNav clearfix">
-        <li><a href="#Register" class="connect_RegisterTabLink">[RESX:LOGIN:CreateAccountTab]</a></li>
-        <li><a href="#Login" class="connect_LoginTabLink">[RESX:LOGIN:LoginTab]</a></li>
-    </ul>
-
-
-
-
-	<div id="Register" class="connect_register">
-		
-		<div class="connect_registernote">
-			<span>Your e-mail adress is used to log on to the website. It is adviseable to use an e-mail account that you will have access to in the future. Otherwise you will not receive e-mail notifications and you will never be able to reset your password later on!</span>
-		</div>
-
-		<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="connect_registernote">
-			<span>You must provide a secure password that contains at least 7 characters.</span>
-		</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 class="connect_registernote" style="padding-top: 30px;">
-            <span>Would you also like to join the DNN-Connect Association?</span><br /><a href="/association">Click here for more information</a>
-        </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 class="dnnFormItem dnnClear" style="padding: 20px 0 20px 35px;">
-			[RECAPTCHA:6LeT2vUSAAAAAK9YCM_6tQw3dbNUYnDVnEi4XEnQ:white]
-		</div>
-
-		<ul class="dnnActions dnnClear">
-		  <li>[CTL:UPDATEBUTTON:CreateAccount]</li>
-		</ul>
-
-
-	</div>
-
-	<div id="Login" class="connect_login">
-
-		<div class="connect_registernote">
-			<span>Welcome back. Login with your e-mail address and your password. Then have fun!</span>
-		</div>
-
-		<div class="dnnFormItem dnnClear">
-		  [DNNLBL:LOGIN:Username]
-		  [CTL:LOGIN:Username]
-		</div>
-		
-		<div class="dnnFormItem dnnClear">
-		  [DNNLBL:LOGIN:Password]
-		  [CTL:LOGIN:Password]
-		</div>
-
-
-		
-		<ul class="dnnActions dnnClear">
-		  <li>[CTL:LOGINBUTTON:Login]</li>
-		  <li>[CTL:LOSTPASSWORDBUTTON:LostPassword]</li>
-		  <li>
-			<div class="dnnFormItem dnnClear RememberMe">
-			  [CTL:LOGIN:Remember]
-			  [DNNLBL:LOGIN:Remember]		  
-			</div>
-		  </li>
-		</ul>
-						
-
-	</div>
-</div>
-
-<script language="javascript" type="text/javascript">
-/*globals jQuery, window, Sys */
-(function ($, Sys) {
-
-    function setupFormSettings() {
-
-        $('#ConnectRegisterForm').dnnTabs();
-
-		$('#Register > .dnnFormItem > input').keypress(function(event){
-
-			  if(event.keyCode == 13){
-				$('#Register > .dnnActions > li > .dnnPrimaryAction').click();
-			  }
-
-		});
-
-		$('#Login > .dnnFormItem > input').keypress(function(event){
-
-			  if(event.keyCode == 13){
-				$('#Login > .dnnActions > li > .dnnPrimaryAction').click();
-			  }
-
-		});
-
-    }
-
-    $(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/Templates/Default/Form.txt b/Templates/Default/Form.txt
index b3a8272..bb35c73 100644
--- a/Templates/Default/Form.txt
+++ b/Templates/Default/Form.txt
@@ -1,11 +1,11 @@
 <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>
+        <li><a href="#Register" class="connect_RegisterTabLink">[RESX:LOGIN:CreateAccountTab]</a></li>
+        <li><a href="#Login" class="connect_LoginTabLink">[RESX:LOGIN:LoginTab]</a></li>
     </ul>
 
-	<div id="dvFormTemplate" class="connect_register">
+	<div id="Register" class="connect_register">
 		
 		<div class="dnnFormItem dnnClear">
 		  [DNNLBL:USER:Username:HideRequired]
@@ -49,7 +49,7 @@
 
 	</div>
 
-		<div id="dvLoginTemplate" class="connect_login">
+	<div id="Login" class="connect_login">
 
 
 		<div class="dnnFormItem dnnClear">
@@ -81,12 +81,27 @@
 (function ($, Sys) {
 
     function setupFormSettings() {
-        $('#ConnectRegisterForm').dnnTabs();
-		$('.connect_LoginTabLink').click(function () {
-			$('#dvLoginTemplate > input.dnnPrimaryAction').focus();
+        
+		$('#ConnectRegisterForm').dnnTabs();
+		
+		$('#Register > .dnnFormItem > input').keypress(function (e){
+			
+			 var key = e.which;
+			 if(key == 13) {
+				$('#Register > .dnnActions > li > .dnnPrimaryAction').click();
+				return false;
+			 }
+
 		});
-		$('.connect_RegisterTabLink').click(function () {
-			$('#dvFormTemplate > input.dnnPrimaryAction').focus();
+
+		$('#Login > .dnnFormItem > input').keypress(function (e){
+
+			var key = e.which;
+			if(key == 13) {
+				$('#Login > .dnnActions > li > .dnnPrimaryAction').click();
+				return false;
+			}
+
 		});
     }
 
diff --git a/obj/Release/Connect.Modules.AccountRegistration.dll b/obj/Release/Connect.Modules.AccountRegistration.dll
deleted file mode 100644
index 00ff88b..0000000
Binary files a/obj/Release/Connect.Modules.AccountRegistration.dll and /dev/null differ
diff --git a/obj/Release/Connect.Modules.AccountRegistration.pdb b/obj/Release/Connect.Modules.AccountRegistration.pdb
deleted file mode 100644
index 7e4f3a2..0000000
Binary files a/obj/Release/Connect.Modules.AccountRegistration.pdb and /dev/null differ
diff --git a/obj/Release/Connect.Modules.AccountRegistration.xml b/obj/Release/Connect.Modules.AccountRegistration.xml
deleted file mode 100644
index 74c05c4..0000000
--- a/obj/Release/Connect.Modules.AccountRegistration.xml
+++ /dev/null
@@ -1,483 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-<assembly>
-<name>
-Connect.Modules.AccountRegistration
-</name>
-</assembly>
-<members>
-<member name="F:Connect.Modules.UserManagement.AccountRegistration.Templates.plTheme">
-	<summary>
-plTheme 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.Templates.drpThemes">
-	<summary>
-drpThemes 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.Templates.cmdCopySelected">
-	<summary>
-cmdCopySelected 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.Templates.cmdDeleteSelected">
-	<summary>
-cmdDeleteSelected 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.Templates.pnlLocales">
-	<summary>
-pnlLocales 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.Templates.plLocale">
-	<summary>
-plLocale 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.Templates.drpLocales">
-	<summary>
-drpLocales 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.Templates.plUseTheme">
-	<summary>
-plUseTheme 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.Templates.chkUseTheme">
-	<summary>
-chkUseTheme 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.Templates.pnlTemplateName">
-	<summary>
-pnlTemplateName 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.Templates.plTemplateName">
-	<summary>
-plTemplateName 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.Templates.txtTemplateName">
-	<summary>
-txtTemplateName 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.Templates.RegisterTemplatesTabs">
-	<summary>
-RegisterTemplatesTabs 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.Templates.lblFormTemplate">
-	<summary>
-lblFormTemplate 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.Templates.lblEmailUser">
-	<summary>
-lblEmailUser 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.Templates.lblEmailUserPrivate">
-	<summary>
-lblEmailUserPrivate 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.Templates.lblEmailUserVerified">
-	<summary>
-lblEmailUserVerified 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.Templates.lblEmailAdminTemplate">
-	<summary>
-lblEmailAdminTemplate 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.Templates.txtFormTemplate">
-	<summary>
-txtFormTemplate 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.Templates.txtEmailUser">
-	<summary>
-txtEmailUser 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.Templates.txtEmailUserPrivate">
-	<summary>
-txtEmailUserPrivate 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.Templates.txtEmailUserVerified">
-	<summary>
-txtEmailUserVerified 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.Templates.txtEmailAdminTemplate">
-	<summary>
-txtEmailAdminTemplate 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.Templates.cmdUpdate">
-	<summary>
-cmdUpdate 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.Templates.cmdUpdateExit">
-	<summary>
-cmdUpdateExit 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.Templates.cmdCancel">
-	<summary>
-cmdCancel 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.lblUsernameMode">
-	<summary>
-lblUsernameMode 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.drpUsernameMode">
-	<summary>
-drpUsernameMode 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.lblDisplaynameMode">
-	<summary>
-lblDisplaynameMode 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.drpDisplaynameMode">
-	<summary>
-drpDisplaynameMode 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.lblRedirectAfterLogin">
-	<summary>
-lblRedirectAfterLogin 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.drpRedirectAfterLogin">
-	<summary>
-drpRedirectAfterLogin 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.lblRedirectAfterSubmit">
-	<summary>
-lblRedirectAfterSubmit 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.drpRedirectAfterSubmit">
-	<summary>
-drpRedirectAfterSubmit 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.lblUsermanagementTab">
-	<summary>
-lblUsermanagementTab 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.drpUserManagementTab">
-	<summary>
-drpUserManagementTab 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.lblAddToRole">
-	<summary>
-lblAddToRole 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.drpAddToRole">
-	<summary>
-drpAddToRole 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.lblAddToRoleStatus">
-	<summary>
-lblAddToRoleStatus 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.drpRoleStatus">
-	<summary>
-drpRoleStatus 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.lblNotifyRole">
-	<summary>
-lblNotifyRole 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.drpNotifyRole">
-	<summary>
-drpNotifyRole 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.lblNotifyUser">
-	<summary>
-lblNotifyUser 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.chkNotifyUser">
-	<summary>
-chkNotifyUser 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.
-</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.txtInterface">
-	<summary>
-txtInterface 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.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.lblCompareFirstNameLastName">
-	<summary>
-lblCompareFirstNameLastName 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.chkCompareFirstNameLastName">
-	<summary>
-chkCompareFirstNameLastName 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.lblValidateEmailThroughRegex">
-	<summary>
-lblValidateEmailThroughRegex 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.chkValidateEmailThroughRegex">
-	<summary>
-chkValidateEmailThroughRegex 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.lblEmailRegex">
-	<summary>
-lblEmailRegex 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.txtEmailRegex">
-	<summary>
-txtEmailRegex 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.View.pnlError">
-	<summary>
-pnlError 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.View.lblError">
-	<summary>
-lblError 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.View.pnlSuccess">
-	<summary>
-pnlSuccess 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.View.lblSucess">
-	<summary>
-lblSucess 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.View.plhRegister">
-	<summary>
-plhRegister control.
-</summary>
-	<remarks>
-Auto-generated field.
-To modify move field declaration from designer file to code-behind file.
-</remarks>
-</member>
-</members>
-</doc>
\ No newline at end of file
diff --git a/obj/Release/Connect_AccountRegistration.vbproj.FileListAbsolute.txt b/obj/Release/Connect_AccountRegistration.vbproj.FileListAbsolute.txt
deleted file mode 100644
index 2b17415..0000000
--- a/obj/Release/Connect_AccountRegistration.vbproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-D:\Development\Websites\dev_DNN7\website\bin\Connect.Modules.AccountRegistration.dll
-D:\Development\Websites\dev_DNN7\website\bin\Connect.Modules.AccountRegistration.pdb
-D:\Development\Websites\dev_DNN7\website\bin\Connect.Modules.AccountRegistration.xml
-D:\Development\Websites\dev_DNN7\website\DesktopModules\Connect\AccountRegistration\obj\Release\Connect_AccountRegistration.vbprojResolveAssemblyReference.cache
-D:\Development\Websites\dev_DNN7\website\DesktopModules\Connect\AccountRegistration\obj\Release\Connect.Modules.AccountRegistration.dll
-D:\Development\Websites\dev_DNN7\website\DesktopModules\Connect\AccountRegistration\obj\Release\Connect.Modules.AccountRegistration.xml
-D:\Development\Websites\dev_DNN7\website\DesktopModules\Connect\AccountRegistration\obj\Release\Connect.Modules.AccountRegistration.pdb
-D:\Development\Websites\dev_DNNConnect\wwwRoot\bin\Connect.Modules.AccountRegistration.dll
-D:\Development\Websites\dev_DNNConnect\wwwRoot\bin\Connect.Modules.AccountRegistration.pdb
-D:\Development\Websites\dev_DNNConnect\wwwRoot\bin\Connect.Modules.AccountRegistration.xml
-D:\Development\Websites\dev_DNNConnect\wwwRoot\DesktopModules\Connect\AccountRegistration\obj\Release\Connect_AccountRegistration.vbprojResolveAssemblyReference.cache
-D:\Development\Websites\dev_DNNConnect\wwwRoot\DesktopModules\Connect\AccountRegistration\obj\Release\Connect.Modules.AccountRegistration.dll
-D:\Development\Websites\dev_DNNConnect\wwwRoot\DesktopModules\Connect\AccountRegistration\obj\Release\Connect.Modules.AccountRegistration.xml
-D:\Development\Websites\dev_DNNConnect\wwwRoot\DesktopModules\Connect\AccountRegistration\obj\Release\Connect.Modules.AccountRegistration.pdb
-C:\Users\Philipp\Development\Projekte\DNN.Connect\wwwRoot\bin\Connect.Modules.AccountRegistration.dll
-C:\Users\Philipp\Development\Projekte\DNN.Connect\wwwRoot\bin\Connect.Modules.AccountRegistration.pdb
-C:\Users\Philipp\Development\Projekte\DNN.Connect\wwwRoot\bin\Connect.Modules.AccountRegistration.xml
-C:\Users\Philipp\Development\Projekte\DNN.Connect\wwwRoot\DesktopModules\Connect\AccountRegistration\obj\Release\Connect_AccountRegistration.vbprojResolveAssemblyReference.cache
-C:\Users\Philipp\Development\Projekte\DNN.Connect\wwwRoot\DesktopModules\Connect\AccountRegistration\obj\Release\Connect.Modules.AccountRegistration.dll
-C:\Users\Philipp\Development\Projekte\DNN.Connect\wwwRoot\DesktopModules\Connect\AccountRegistration\obj\Release\Connect.Modules.AccountRegistration.xml
-C:\Users\Philipp\Development\Projekte\DNN.Connect\wwwRoot\DesktopModules\Connect\AccountRegistration\obj\Release\Connect.Modules.AccountRegistration.pdb
diff --git a/obj/Release/Connect_AccountRegistration.vbprojResolveAssemblyReference.cache b/obj/Release/Connect_AccountRegistration.vbprojResolveAssemblyReference.cache
deleted file mode 100644
index 5fd6519..0000000
Binary files a/obj/Release/Connect_AccountRegistration.vbprojResolveAssemblyReference.cache and /dev/null differ
diff --git a/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index 1f49ca3..0000000
Binary files a/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and /dev/null differ