diff --git a/BTCPayServer/Views/Manage/Index.cshtml b/BTCPayServer/Views/Manage/Index.cshtml
index eb0a258f5..65146ccdc 100644
--- a/BTCPayServer/Views/Manage/Index.cshtml
+++ b/BTCPayServer/Views/Manage/Index.cshtml
@@ -6,38 +6,43 @@
 
 <partial name="_StatusMessage" />
 
-<div class="row">
-    <div class="col-md-6">
-        <div asp-validation-summary="All" class="text-danger"></div>
+@if (!this.ViewContext.ModelState.IsValid)
+{
+    <div class="row">
+        <div class="col-md-6">
+            <div asp-validation-summary="All" class="text-danger"></div>
+        </div>
     </div>
-</div>
-<div class="row">
-    <div class="col-md-6">
-        <form method="post">
-            <div class="form-group">
-                <label asp-for="Username"></label>
-                <input asp-for="Username" class="form-control" disabled />
-            </div>
-            <div class="form-group">
-                <label asp-for="Email"></label>
-                @if(Model.IsEmailConfirmed)
-                {
-                    <div class="input-group">
-                        <input asp-for="Email" class="form-control" />
-                        <span class="input-group-addon" aria-hidden="true"><span class="fa fa-check text-success"></span></span>
-                    </div>
-                }
-                else
-                {
-                    <input asp-for="Email" class="form-control" />
-                    <button asp-action="SendVerificationEmail" class="btn btn-link">Send verification email</button>
-                }
-                <span asp-validation-for="Email" class="text-danger"></span>
-            </div>
-            <button type="submit" class="btn btn-primary">Save</button>
-        </form>
+}
+<form method="post">
+    <div class="form-row">
+        <div class="col-md-6 mb-3">
+            <label asp-for="Username"></label>
+            <input asp-for="Username" class="form-control" disabled />
+        </div>
     </div>
-</div>
+    <div class="form-row">
+        <div class="col-md-6 mb-3">
+            <label asp-for="Email"></label>
+            <input asp-for="Email" class="form-control" />
+            <span asp-validation-for="Email" class="text-danger"></span>
+        </div>
+        <div class="col-md-6 mb-3 d-flex align-items-end">
+            @if(Model.IsEmailConfirmed)
+            {
+                <span class="badge badge-success p-2 my-1">
+                    <span class="fa fa-check"></span>
+                    confirmed
+                </span>
+            }
+            else
+            {
+                <button asp-action="SendVerificationEmail" class="btn btn-secondary">Send verification email</button>
+            }
+        </div>
+    </div>
+    <button type="submit" class="btn btn-primary">Save</button>
+</form>
 
 @section Scripts {
     @await Html.PartialAsync("_ValidationScriptsPartial")