diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Styles/admin.css b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Styles/admin.css
index 7c8accc26..e67fd1d5d 100644
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Styles/admin.css
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Styles/admin.css
@@ -1,3 +1,4 @@
 .tenantHost {
-font-size: .8em;
-}
\ No newline at end of file
+    font-size: .8em;
+}
+
diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Add.ascx b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Add.ascx
index fbf8f4dbf..fba1cae82 100644
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Add.ascx
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Add.ascx
@@ -28,15 +28,17 @@
         <div>
             <%: Html.RadioButtonFor(svm => svm.DataProvider, "SqlServer", new { id = "sqlDatabaseOption" })%>
             <label for="sqlDatabaseOption" class="forcheckbox"><%: T("Use an existing SQL Server (or SQL Express) database") %></label>
-            <span data-controllerid="sqlDatabaseOption">
-            <label for="DatabaseConnectionString"><%: T("Connection string") %></label>
-            <%: Html.EditorFor(svm => svm.DatabaseConnectionString)%>
-            <span class="hint"><%: T("Example:") %><br /><%: T("Data Source=sqlServerName;Initial Catalog=dbName;Persist Security Info=True;User ID=userName;Password=password") %></span>
-            </span>
-            <span data-controllerid="sqlDatabaseOption">
-            <label for="DatabaseTablePrefix"><%: T("Database Table Prefix") %></label>
-            <%: Html.EditorFor(svm => svm.DatabaseTablePrefix)%>
-            </span>
+            <div class="options">
+                <span data-controllerid="sqlDatabaseOption">
+                    <label for="DatabaseConnectionString"><%: T("Connection string") %></label>
+                    <%: Html.EditorFor(svm => svm.DatabaseConnectionString)%>
+                    <span class="hint"><%: T("Example:") %> <%: T("Data Source=sqlServerName;Initial Catalog=dbName;Persist Security Info=True;User ID=userName;Password=password") %></span>
+                </span>
+                <span data-controllerid="sqlDatabaseOption">
+                    <label for="DatabaseTablePrefix"><%: T("Database Table Prefix") %></label>
+                    <%: Html.EditorFor(svm => svm.DatabaseTablePrefix)%>
+                </span>
+            </div>
         </div>
     </fieldset>
 	<fieldset>
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
index c1bd1d169..61ae5be10 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
+++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
@@ -590,6 +590,28 @@ button.remove:focus::-moz-focus-inner, .remove.button:focus::-moz-focus-inner {
    margin-left:.3em;
 }
 
+.options 
+{
+    margin: 12px 0px 12px 0px;
+}
+
+.options span /* This is just a fix. We need to fix the base HTML */
+{
+    display: block;
+    margin: 12px 0 0 0;
+}
+
+.options span.hint /* This is just a fix. We need to fix the base HTML */
+{
+    display: block;
+    margin: 0 0 0 0;
+}
+
+.options input[type="text"] /* This is just a fix. We need to fix the base HTML */
+{
+    width:26em;
+}
+
 
 /* Icon buttons
 ----------------------------------------------------------*/