diff --git a/pkg/server/assets/styles/src/_settings.scss b/pkg/server/assets/styles/src/_settings.scss
index d3068bec..81c2ac43 100644
--- a/pkg/server/assets/styles/src/_settings.scss
+++ b/pkg/server/assets/styles/src/_settings.scss
@@ -112,10 +112,12 @@
       word-break: break-all;
       justify-content: space-between;
       align-items: center;
+      margin-top: rem(4px);
 
       @include breakpoint(md) {
         flex-direction: row;
         align-items: center;
+        margin-top: 0;
       }
     }
 
diff --git a/pkg/server/views/users/login.gohtml b/pkg/server/views/users/login.gohtml
index 52c070ca..5bd7f4bc 100644
--- a/pkg/server/views/users/login.gohtml
+++ b/pkg/server/views/users/login.gohtml
@@ -36,7 +36,7 @@
 {{end}}
 
 {{define "loginForm"}}
-<form action="{{ if .Referrer }} {{ getPathWithReferrer "/login" .Referrer }} {{else}} /login {{end}}" method="POST">
+<form id="T-login-form" action="{{ if .Referrer }} {{ getPathWithReferrer "/login" .Referrer }} {{else}} /login {{end}}" method="POST">
   {{csrfField}}
 
   <div class="input-row">
diff --git a/pkg/server/views/users/settings.gohtml b/pkg/server/views/users/settings.gohtml
index faad58cc..c38cc9cf 100644
--- a/pkg/server/views/users/settings.gohtml
+++ b/pkg/server/views/users/settings.gohtml
@@ -12,79 +12,11 @@
 
       <div class="col-12 col-md-12 col-lg-9">
         <div class="setting-section-wrapper">
-          <section class="setting-section">
-            <h2 class="section-heading">Email</h2>
-
-            <div class="setting-row">
-              <div class="setting-row-summary">
-                <div>
-                  <h3 class="setting-name">Current Email</h3>
-                </div>
-
-                <div class="setting-right">
-                  {{.Email}}
-                </div>
-              </div>
-            </div>
-
-            <div class="setting-row">
-              <div class="setting-row-summary">
-                <div>
-                  <h3 class="setting-name">Email Verified</h3>
-                </div>
-
-                <div class="setting-right">
-                {{ if eq true false }} b{{end}}
-
-                  {{if .EmailVerified}}
-                    Yes
-                  {{else}}
-                    No
-
-                    <form action="/verification-token" method="POST" class="email-verification-form">
-                      <button
-                        class="button button-second button-small"
-                        type="submit"
-                      >
-                        Send verification email
-                      </button>
-                    </form>
-                  {{end}}
-                </div>
-              </div>
-            </div>
-
-            <div class="setting-row">
-              <div class="setting-row-summary">
-                <div>
-                  <h3 class="setting-name">Change Email</h3>
-                </div>
-              </div>
-
-              <div class="setting-row-main">
-                {{template "emailForm" .}}
-              </div>
-            </div>
-          </section>
-
-          <section class="setting-section">
-            <h2 class="section-heading">Password</h2>
-
-            <div class="setting-row">
-              <div class="setting-row-summary">
-                <div>
-                  <h3 class="setting-name">Change Password</h3>
-                  <p class="setting-desc">
-                    Set a unique password to protect your data.
-                  </p>
-                </div>
-              </div>
-
-              <div class="setting-row-main">
-                {{template "passwordChangeForm" .}}
-              </div>
-            </div>
-          </section>
+          {{if ne .Standalone "true"}}
+            {{template "planSection" .}}
+          {{end}}
+          {{template "emailSection" .}}
+          {{template "passwordSection" .}}
         </div>
       </div>
     </div>
@@ -198,3 +130,112 @@
   </div>
 </form>
 {{end}}
+
+{{define "emailSection"}}
+<section class="setting-section">
+  <h2 class="section-heading">Email</h2>
+
+  <div class="setting-row">
+    <div class="setting-row-summary">
+      <div>
+        <h3 class="setting-name">Current Email</h3>
+      </div>
+
+      <div class="setting-right">
+        {{.Email}}
+      </div>
+    </div>
+  </div>
+
+  <div class="setting-row">
+    <div class="setting-row-summary">
+      <div>
+        <h3 class="setting-name">Email Verified</h3>
+      </div>
+
+      <div class="setting-right">
+      {{ if eq true false }} b{{end}}
+
+        {{if .EmailVerified}}
+          Yes
+        {{else}}
+          No
+
+          <form action="/verification-token" method="POST" class="email-verification-form">
+            <button
+              id="#T-send-verification-button"
+              class="button button-second button-small"
+              type="submit"
+            >
+              Send verification email
+            </button>
+          </form>
+        {{end}}
+      </div>
+    </div>
+  </div>
+
+  <div class="setting-row">
+    <div class="setting-row-summary">
+      <div>
+        <h3 class="setting-name">Change Email</h3>
+      </div>
+    </div>
+
+    <div class="setting-row-main">
+      {{template "emailForm" .}}
+    </div>
+  </div>
+</section>
+{{end}}
+
+{{define "passwordSection"}}
+<section class="setting-section">
+  <h2 class="section-heading">Password</h2>
+
+  <div class="setting-row">
+    <div class="setting-row-summary">
+      <div>
+        <h3 class="setting-name">Change Password</h3>
+        <p class="setting-desc">
+          Set a unique password to protect your data.
+        </p>
+      </div>
+    </div>
+
+    <div class="setting-row-main">
+      {{template "passwordChangeForm" .}}
+    </div>
+  </div>
+</section>
+{{end}}
+
+{{define "planSection"}}
+<section class="setting-section">
+  <h2 class="section-heading">Plan</h2>
+
+  <div class="setting-row">
+    <div class="setting-row-summary">
+      <div>
+        <h3 class="setting-name">Dnote Pro</h3>
+        <p class="setting-desc">
+          Fully hosted and managed Dnote for you.
+        </p>
+      </div>
+
+      <div class="setting-right">
+        {{if .Cloud}}
+          Yes
+        {{else}}
+          <a id="#T-unlock-pro-btn"
+            href="/subscriptions"
+            class="button button-first button-small">
+            Unlock
+          </a>
+        {{end}}
+      </div>
+    </div>
+
+  </div>
+</section>
+{{end}}