diff --git a/src/main/twirl/account/edit.scala.html b/src/main/twirl/account/edit.scala.html
index 2eeb22aac..24e0eaf04 100644
--- a/src/main/twirl/account/edit.scala.html
+++ b/src/main/twirl/account/edit.scala.html
@@ -18,15 +18,17 @@
             <span id="error-userName" class="error"></span>
           </fieldset>
         }
-        <fieldset>
-          <label for="password"><strong>Password</strong>
-            @if(account.nonEmpty){
-              (Input to change password)
-            }
-          </label>
-          <input type="password" name="password" id="password" value=""/>
-          <span id="error-password" class="error"></span>
-        </fieldset>
+        @if(account.map(_.password.nonEmpty).getOrElse(true)){
+          <fieldset>
+            <label for="password"><strong>Password</strong>
+              @if(account.nonEmpty){
+                (Input to change password)
+              }
+            </label>
+            <input type="password" name="password" id="password" value=""/>
+            <span id="error-password" class="error"></span>
+          </fieldset>
+        }
         <fieldset>
           <label for="mailAddress"><strong>Mail Address</strong></label>
           <input type="text" name="mailAddress" id="mailAddress" value="@account.map(_.mailAddress)"/>
diff --git a/src/main/twirl/admin/users/user.scala.html b/src/main/twirl/admin/users/user.scala.html
index 98ae9edb9..713d45951 100644
--- a/src/main/twirl/admin/users/user.scala.html
+++ b/src/main/twirl/admin/users/user.scala.html
@@ -10,16 +10,18 @@
             <span id="error-userName" class="error"></span>
             <input type="text" name="userName" id="userName" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
           </fieldset>
-          <fieldset>
-            <label for="password">
-              <strong>Password</strong>
-              @if(account.isDefined){
-                (Input to change password)
-              }
-            </label>
-            <span id="error-password" class="error"></span>
-            <input type="password" name="password" id="password" value="" autocomplete="off"/>
-          </fieldset>
+          @if(account.map(_.password.nonEmpty).getOrElse(true)){
+            <fieldset>
+              <label for="password">
+                <strong>Password</strong>
+                @if(account.isDefined){
+                  (Input to change password)
+                }
+              </label>
+              <span id="error-password" class="error"></span>
+              <input type="password" name="password" id="password" value="" autocomplete="off"/>
+            </fieldset>
+          }
           <fieldset>
             <label for="mailAddress"><strong>Mail Address</strong></label>
             <span id="error-mailAddress" class="error"></span>