diff --git a/BTCPayServer/Services/Mails/EmailSettings.cs b/BTCPayServer/Services/Mails/EmailSettings.cs
index 8f18d3f2c..99d22de8c 100644
--- a/BTCPayServer/Services/Mails/EmailSettings.cs
+++ b/BTCPayServer/Services/Mails/EmailSettings.cs
@@ -20,12 +20,12 @@ namespace BTCPayServer.Services.Mails
             get; set;
         }
 
-        public String Login
+        public string Login
         {
             get; set;
         }
-
-        public String Password
+        [DataType(DataType.Password)]
+        public string Password
         {
             get; set;
         }
diff --git a/BTCPayServer/Views/Server/Emails.cshtml b/BTCPayServer/Views/Server/Emails.cshtml
index 803b99c1d..87d511d58 100644
--- a/BTCPayServer/Views/Server/Emails.cshtml
+++ b/BTCPayServer/Views/Server/Emails.cshtml
@@ -4,64 +4,4 @@
 }
 
 
-<h4>@ViewData["Title"]</h4>
-<partial name="_StatusMessage" for="StatusMessage" />
-
-
-<div class="row">
-    <div class="col-md-6">
-        <div asp-validation-summary="All" class="text-danger"></div>
-    </div>
-</div>
-<div class="row">
-    <div class="col-md-6">
-        <form method="post">
-            <div class="form-group">
-                <label asp-for="Settings.Server"></label>
-                <input asp-for="Settings.Server" class="form-control" />
-                <span asp-validation-for="Settings.Server" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="Settings.Port"></label>
-                <input asp-for="Settings.Port" class="form-control" />
-                <span asp-validation-for="Settings.Port" class="text-danger"></span>
-            </div>
-
-            <div class="form-group">
-                <label asp-for="Settings.From"></label>
-                <input asp-for="Settings.From" class="form-control" />
-                <span asp-validation-for="Settings.From" class="text-danger"></span>
-            </div>
-
-            <div class="form-group">
-                <label asp-for="Settings.Login"></label>
-                <input asp-for="Settings.Login" class="form-control" />
-                <span asp-validation-for="Settings.Login" class="text-danger"></span>
-            </div>
-
-            <div class="form-group">
-                <label asp-for="Settings.Password"></label>
-                <input asp-for="Settings.Password" type="password" class="form-control" value="@Model.Settings.Password" />
-                <span asp-validation-for="Settings.Password" class="text-danger"></span>
-            </div>
-
-            <div class="form-group">
-                <label asp-for="Settings.EnableSSL"></label>
-                <input asp-for="Settings.EnableSSL" type="checkbox" class="form-check-inline" />
-            </div>
-
-            <div class="form-group">
-                <label asp-for="TestEmail"></label>
-                <input asp-for="TestEmail" class="form-control" />
-                <span asp-validation-for="TestEmail" class="text-danger"></span>
-            </div>
-
-            <button type="submit" class="btn btn-primary" name="command" value="Save">Save</button>
-            <button type="submit" class="btn btn-primary" name="command" value="Test">Test</button>
-        </form>
-    </div>
-</div>
-
-@section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
-}
+<partial name="EmailsBody" model="@Model"/>
diff --git a/BTCPayServer/Views/Shared/EmailsBody.cshtml b/BTCPayServer/Views/Shared/EmailsBody.cshtml
new file mode 100644
index 000000000..6ad15fcb2
--- /dev/null
+++ b/BTCPayServer/Views/Shared/EmailsBody.cshtml
@@ -0,0 +1,63 @@
+@model BTCPayServer.Models.ServerViewModels.EmailsViewModel
+
+
+<h4>@ViewData["Title"]</h4>
+<partial name="_StatusMessage" for="StatusMessage" />
+
+<div class="row">
+    <div class="col-md-6">
+        <div asp-validation-summary="All" class="text-danger"></div>
+    </div>
+</div>
+<div class="row">
+    <div class="col-md-6">
+        <form method="post">
+            <div class="form-group">
+                <label asp-for="Settings.Server"></label>
+                <input asp-for="Settings.Server" class="form-control" />
+                <span asp-validation-for="Settings.Server" class="text-danger"></span>
+            </div>
+            <div class="form-group">
+                <label asp-for="Settings.Port"></label>
+                <input asp-for="Settings.Port" class="form-control" />
+                <span asp-validation-for="Settings.Port" class="text-danger"></span>
+            </div>
+
+            <div class="form-group">
+                <label asp-for="Settings.From"></label>
+                <input asp-for="Settings.From" class="form-control" />
+                <span asp-validation-for="Settings.From" class="text-danger"></span>
+            </div>
+
+            <div class="form-group">
+                <label asp-for="Settings.Login"></label>
+                <input asp-for="Settings.Login" class="form-control" />
+                <span asp-validation-for="Settings.Login" class="text-danger"></span>
+            </div>
+
+            <div class="form-group">
+                <label asp-for="Settings.Password"></label>
+                <input asp-for="Settings.Password" value="@Model.Settings.Password" class="form-control" />
+                <span asp-validation-for="Settings.Password" class="text-danger"></span>
+            </div>
+
+            <div class="form-group">
+                <label asp-for="Settings.EnableSSL"></label>
+                <input asp-for="Settings.EnableSSL" type="checkbox" class="form-check-inline" />
+            </div>
+
+            <div class="form-group">
+                <label asp-for="TestEmail"></label>
+                <input asp-for="TestEmail" class="form-control" />
+                <span asp-validation-for="TestEmail" class="text-danger"></span>
+            </div>
+
+            <button type="submit" class="btn btn-primary" name="command" value="Save">Save</button>
+            <button type="submit" class="btn btn-primary" name="command" value="Test">Test</button>
+        </form>
+    </div>
+</div>
+
+@section Scripts {
+    @await Html.PartialAsync("_ValidationScriptsPartial")
+}
diff --git a/BTCPayServer/Views/Stores/Emails.cshtml b/BTCPayServer/Views/Stores/Emails.cshtml
index 4f16071eb..2155c5f75 100644
--- a/BTCPayServer/Views/Stores/Emails.cshtml
+++ b/BTCPayServer/Views/Stores/Emails.cshtml
@@ -5,64 +5,4 @@
 }
 
 
-<h4>@ViewData["Title"]</h4>
-<partial name="_StatusMessage" for="StatusMessage" />
-
-
-<div class="row">
-    <div class="col-md-6">
-        <div asp-validation-summary="All" class="text-danger"></div>
-    </div>
-</div>
-<div class="row">
-    <div class="col-md-6">
-        <form method="post">
-            <div class="form-group">
-                <label asp-for="Settings.Server"></label>
-                <input asp-for="Settings.Server" class="form-control" />
-                <span asp-validation-for="Settings.Server" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="Settings.Port"></label>
-                <input asp-for="Settings.Port" class="form-control" />
-                <span asp-validation-for="Settings.Port" class="text-danger"></span>
-            </div>
-
-            <div class="form-group">
-                <label asp-for="Settings.From"></label>
-                <input asp-for="Settings.From" class="form-control" />
-                <span asp-validation-for="Settings.From" class="text-danger"></span>
-            </div>
-
-            <div class="form-group">
-                <label asp-for="Settings.Login"></label>
-                <input asp-for="Settings.Login" class="form-control" />
-                <span asp-validation-for="Settings.Login" class="text-danger"></span>
-            </div>
-
-            <div class="form-group">
-                <label asp-for="Settings.Password"></label>
-                <input asp-for="Settings.Password" type="password" class="form-control" />
-                <span asp-validation-for="Settings.Password" class="text-danger"></span>
-            </div>
-
-            <div class="form-group">
-                <label asp-for="Settings.EnableSSL"></label>
-                <input asp-for="Settings.EnableSSL" type="checkbox" class="form-check-inline" />
-            </div>
-
-            <div class="form-group">
-                <label asp-for="TestEmail"></label>
-                <input asp-for="TestEmail" class="form-control" />
-                <span asp-validation-for="TestEmail" class="text-danger"></span>
-            </div>
-
-            <button type="submit" class="btn btn-primary" name="command" value="Save">Save</button>
-            <button type="submit" class="btn btn-primary" name="command" value="Test">Test</button>
-        </form>
-    </div>
-</div>
-
-@section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
-}
+<partial name="EmailsBody" model="@Model"/>