diff --git a/BTCPayServer/Views/Account/Login.cshtml b/BTCPayServer/Views/Account/Login.cshtml
index 2df567e0b..b37f277ee 100644
--- a/BTCPayServer/Views/Account/Login.cshtml
+++ b/BTCPayServer/Views/Account/Login.cshtml
@@ -62,15 +62,17 @@
                         <div class="form-group">
                             <button type="submit" class="btn btn-primary btn-block btn-lg" id="LoginButton">Sign in</button>
                         </div>
-                        <p class="hint-text"><a asp-action="ForgotPassword">Forgot your password?</a></p>
+                        <p class="text-right mt-4 mb-2">
+                            <a asp-action="ForgotPassword" class="text-secondary">Forgot your password?</a>
+                        </p>
                     </fieldset>
                 </form>
             </div>
             @if (themeManager.ShowRegister)
             {
                 <div class="modal-footer">
-                    <div>Don't have an account?</div>
-                    <a id="Register" class="btn btn-secondary ml-2" asp-action="Register" asp-route-returnurl="@ViewData["ReturnUrl"]">Sign Up</a>
+                    Don't have an account?
+                    <a id="Register" class="btn btn-secondary ml-3" asp-action="Register" asp-route-returnurl="@ViewData["ReturnUrl"]">Sign Up</a>
                 </div>
             }
         </div>
diff --git a/BTCPayServer/Views/Account/Register.cshtml b/BTCPayServer/Views/Account/Register.cshtml
index ecb5cc696..065ad025b 100644
--- a/BTCPayServer/Views/Account/Register.cshtml
+++ b/BTCPayServer/Views/Account/Register.cshtml
@@ -75,9 +75,9 @@
                         </div>
                         @if (ViewData["AllowIsAdmin"] is true)
                         {
-                            <div class="form-group">
-                                <label asp-for="IsAdmin"></label>
-                                <input asp-for="IsAdmin" type="checkbox" class="form-check-inline"/>
+                            <div class="form-group form-check">
+                                <input asp-for="IsAdmin" type="checkbox" class="form-check-input"/>
+                                <label asp-for="IsAdmin" class="form-check-label"></label>
                                 <span asp-validation-for="IsAdmin" class="text-danger"></span>
                             </div>
                         }
@@ -87,7 +87,10 @@
                     </fieldset>
                 </form>
             </div>
-            <div class="modal-footer"><span>Already have an account? <a id="Login" asp-action="Login" asp-route-returnurl="@ViewData["ReturnUrl"]">Login</a></span></div>
+            <div class="modal-footer">
+                Already have an account?
+                <a id="Login" class="btn btn-secondary ml-3" asp-action="Login" asp-route-returnurl="@ViewData["ReturnUrl"]">Login</a>
+            </div>
         </div>
     </div>
 </div>