diff --git a/views/layouts/outer-header.ejs b/views/layouts/outer-header.ejs
index 73eefacf..2e9fda85 100644
--- a/views/layouts/outer-header.ejs
+++ b/views/layouts/outer-header.ejs
@@ -19,7 +19,7 @@
       <div class="header-right pull-right">
         <% if (!user) { %>
           <a class="btn btn-md btn-dark btn-round" href="/login"><%=__("login")%></a>
-          <a class="btn btn-md btn-dark btn-round" href="/signup"><%=__("signup")%></a>
+          <!-- <a class="btn btn-md btn-dark btn-round" href="/signup"><%=__("signup")%></a> -->
         <% } else { %>
           <a class="btn btn-md btn-dark btn-round" href="/spaces"><%=__("spaces")%></a>
           <a class="btn btn-md btn-dark btn-round" href="/logout"><%=__("logout")%></a>
diff --git a/views/partials/account.html b/views/partials/account.html
index ebffe757..58929533 100644
--- a/views/partials/account.html
+++ b/views/partials/account.html
@@ -20,8 +20,8 @@ <h5>Edit Account</h5>
     <div class="dialog-tab" v-bind:class="{open:account=='profile'}" v-on:click="account='profile'"><span><%=__("profile_caption")%></span></div>
     <div class="dialog-tab" v-bind:class="{open:account=='language'}" v-on:click="account='language'"><span><%=__("language_caption")%></span></div>
     <div class="dialog-tab" v-bind:class="{open:account=='notifications'}" v-on:click="account='notifications'"><span><%=__("notifications_caption")%></span></div>
-    <div class="dialog-tab" v-bind:class="{open:account=='password'}" v-on:click="account='password'"><span><%=__("password_caption")%></span></div>
-    <div class="dialog-tab" v-bind:class="{open:account=='terminate'}" v-on:click="account='terminate'"><span><%=__("terminate_caption")%></span></div>
+    <!-- <div class="dialog-tab" v-bind:class="{open:account=='password'}" v-on:click="account='password'"><span><%=__("password_caption")%></span></div>
+    <div class="dialog-tab" v-bind:class="{open:account=='terminate'}" v-on:click="account='terminate'"><span><%=__("terminate_caption")%></span></div> -->
   </div>
 
   <div class="dialog-section text-left">
@@ -78,11 +78,12 @@ <h5>Edit Account</h5>
           <label class="label"><%=__("profile_email")%></label>
           <input
           type="email"
+          disabled
           id="new-email"
-          class="input input-white no-b"
+          class="input no-b"
           v-model="user.email"
-          v-on:change="user.email_changed=true"
           placeholder="mail@example.com">
+          <!-- v-on:change="user.email_changed=true" -->
         </div>
 
         <div class="form-group">
@@ -126,7 +127,7 @@ <h5>Edit Account</h5>
       </div>
     </div>
 
-    <div class="collapse" v-bind:class="{in:account=='password'}">
+    <!-- <div class="collapse" v-bind:class="{in:account=='password'}">
       <h4>Change Password</h4>
       <div class="modal-section labels-inline">
         <div class="form-group">
@@ -177,5 +178,5 @@ <h4>Terminate Account</h4>
         <button class="btn btn-stroke-darken btn-md" v-on:click="remove_account(account_remove_password, account_remove_feedback)">Terminate Account</button>
       </div>
     </div>
-  </div>
+  </div> -->
 </div>
diff --git a/views/partials/login.html b/views/partials/login.html
index 242dcea1..e3e8f30e 100644
--- a/views/partials/login.html
+++ b/views/partials/login.html
@@ -5,7 +5,7 @@
 
   <div class="header-right pull-right">
     <a v-if="active_view != 'login'" class="btn btn-md btn-dark btn-round" href="/login"><%= __("login") %></a>
-    <a v-if="active_view != 'signup'" class="btn btn-md btn-dark btn-round" href="/signup"><%= __("signup") %></a>
+    <!-- <a v-if="active_view != 'signup'" class="btn btn-md btn-dark btn-round" href="/signup"><%= __("signup") %></a> -->
   </div>
 </header>
 
@@ -21,7 +21,7 @@ <h3>Login</h3>
 
         <div class="tight">
           <div class="form-group">
-            <input class="input" name="email" type="email" required v-model="user_forms_email" placeholder="<%=__("email")%>">
+            <input class="input" name="email" type="text" required v-model="user_forms_email" placeholder="<%=__("email")%>">
           </div>
           <div class="form-group">
             <input class="input" name="password" type="password" required v-model="login_password" placeholder="<%=__("password")%>">
@@ -35,9 +35,9 @@ <h3>Login</h3>
 
         <div class="center alert alert-danger" v-if="login_error">{{login_error}}</div>
 
-        <div style="margin-top:2em">
+        <!-- <div style="margin-top:2em">
           <a href="/password-reset">Forgot Password</a>
-        </div>
+        </div> -->
       </form>
     </div>
   </div>