diff --git a/lib/msdeploy/parameters.xml b/lib/msdeploy/parameters.xml
index 4b7acb8b8..17c00292f 100644
--- a/lib/msdeploy/parameters.xml
+++ b/lib/msdeploy/parameters.xml
@@ -1,4 +1,4 @@
-<parameters>
+<parameters>
 	<!-- Prompts where to copy the content files and takes a web site path (such as "contoso.com/app") -->
 	<parameter name="Application Path" description="Full site path where you would like to install your application (i.e., Default Web Site/orchard)" defaultValue="Default Web Site/orchard" tags="iisapp">
 		<parameterEntry type="ProviderPath" scope="iisapp" match="Orchard" />
@@ -13,15 +13,7 @@
 		<parameterEntry type="ProviderPath" scope="setAcl" match="Orchard/Media" /> 
 	</parameter>
 
-	<parameter name="SetAclParameter3" description="Hidden - automatically sets write access for the app" defaultValue="{Application Path}/Modules" tags="Hidden">
-		<parameterEntry type="ProviderPath" scope="setAcl" match="Orchard/Modules" /> 
-	</parameter>
-
-	<parameter name="SetAclParameter4" description="Hidden - automatically sets write access for the app" defaultValue="{Application Path}/Themes" tags="Hidden">
-		<parameterEntry type="ProviderPath" scope="setAcl" match="Orchard/Themes" /> 
-	</parameter>
-
-   	<!-- Prompts for database server name, this is used in the connection string parameter later -->
+       	<!-- Prompts for database server name, this is used in the connection string parameter later -->
 	<parameter name="Database Server" description="Location of your database server (i.e. server name, IP address, or server\instance)" defaultValue=".\SQLEXPRESS" tags="SQL, dbServer">
 	</parameter>
 
@@ -30,13 +22,13 @@
 		<parameterEntry type="TextFile" scope="install.sql" match="PlaceHolderForDb" />
 	</parameter>	
 
-    <!-- Prompts for the database username and fills it into the database scripts.
+        <!-- Prompts for the database username and fills it into the database scripts.
 	The SQL tag indicates it is a parameter required for SQL, the DbUsername tag indicates this is a Db username -->
 	<parameter name="Database Username" description="User name to access you application database." defaultValue="orcharduser" tags="SQL, DbUsername">
 		<parameterEntry type="TextFile" scope="install.sql" match="PlaceHolderForUser" />
 	</parameter>
 
-    <!-- Prompts for the database password and fills it into the database scripts.
+        <!-- Prompts for the database password and fills it into the database scripts.
 	The SQL tag indicates it is a parameter required for SQL, the DbUserPassword tag indicates this is a Db password -->
 	<parameter name="Database Password" description="Password for the Database Username." tags="New, Password, SQL, DbUserPassword">
 		<parameterEntry type="TextFile" scope="install.sql" match="PlaceHolderForPassword" />
@@ -54,24 +46,18 @@
 	<parameter name="Database Administrator Password" description="Password for the database administrator account." tags="New, Password, SQL, dbAdminPassword">
 	</parameter>
 	
-	<!-- This is the hidden admin connection string used to run the database scripts -->
-	<parameter name="Connection String" description="Automatically sets the connection string for the connection request." defaultValue="Server={Database Server};Database={Database Name};uid={Database Administrator};Pwd={Database Administrator Password};" tags="Hidden, SQL">
-		<parameterEntry type="ProviderPath" scope="dbfullsql" match="install.sql" />
+	<parameter name="Admin Connection String SqlServer" 
+	tags="SQLConnectionString, AdminConnectionString, Hidden, Validate" description="Automatically sets the connection string for the connection request." 
+	defaultValue="Data Source={Database Server};Initial Catalog={Database Name};User Id={Database Administrator};Password={Database Administrator Password}">
+		<parameterEntry type="ProviderPath" scope="dbfullsql" match="install.sql" /> 
 	</parameter>
-
-        <parameter name="Settings Data Provider for SQL" description="Orchard SQL Data Provider Setting" defaultValue="DataProvider: SqlServer" tags="Hidden, SQL">
-               <parameterEntry kind="TextFile" scope="\\Settings\.txt$" match="DataProvider\s*:[^\r\n]*" />
-        </parameter>
-
-        <parameter name="Settings Data Connection String for SQL" description="Orchard SQL Data Connection String Setting" defaultValue="DataConnectionString: Server={Database Server};Database={Database Name};uid={Database Administrator};Pwd={Database Administrator Password};" tags="Hidden, SQL">
-               <parameterEntry kind="TextFile" scope="\\Settings\.txt$" match="DataConnectionString\s*:[^\r\n]*" />
-        </parameter>
-
-        <parameter name="Settings Data Provider for SQLCE" description="Orchard SQLCE Data Provider Setting" defaultValue="DataProvider: SqlCe" tags="Hidden, SQLCE, NoStore">
-               <parameterEntry kind="TextFile" scope="\\Settings\.txt$" match="DataProvider\s*:[^\r\n]*" />
-        </parameter>
-
-        <parameter name="Settings Data Connection String for SQLCE" description="Orchard SQLCE Data Connection String Setting" defaultValue="DataConnectionString: " tags="Hidden, SQLCE, NoStore">
-               <parameterEntry kind="TextFile" scope="\\Settings\.txt$" match="DataConnectionString\s*:[^\r\n]*" />
-        </parameter>	
+	
+	<parameter name="Non-Admin Connection String SqlServer" 
+	tags="SQLConnectionString, UserConnectionString, Hidden" description="Automatically sets the connection string for the connection request." 
+	defaultValue="Data Source={Database Server};Initial Catalog={Database Name};User Id={Database Username};Password={Database Password}">
+	</parameter>
+	
+	<parameter name="Orchard Connection String" friendlyName="Orchard Connection String" description="Orchard SQL Data Connection String Setting" defaultValue="" tags="Sql, SqlCE, SingleLineConnectionString, Hidden">
+		<parameterEntry kind="TextFile" scope="\\Settings\.txt$" match="(?&lt;=\s*DataConnectionString:\s+)[^\s].*[^\r\n]" /> 
+	</parameter>	
 </parameters>
\ No newline at end of file