diff --git a/src/pages/login_page.html b/src/pages/login_page.html
index 3b087d7..28b15dd 100644
--- a/src/pages/login_page.html
+++ b/src/pages/login_page.html
@@ -28,9 +28,16 @@
 
     <div>
         <label class="input_label">Password</label><br />
-        <input type="password" name="password" placeholder="" required />
+        <div class="password_box">
+            <input type="password" name="password" placeholder="" required />
+            <button type="button" class="show_password_toggle closed"></button>
+        </div>
     </div>
     <button type="submit">Login</button>
 </form>
 
 <script src="/static/error/error.js" type="text/javascript"></script>
+<script
+    src="/static/javascript/show_password.js"
+    type="text/javascript"
+></script>
diff --git a/src/pages/profile_page.html b/src/pages/profile_page.html
index f0e52a9..7b7c8f4 100644
--- a/src/pages/profile_page.html
+++ b/src/pages/profile_page.html
@@ -11,9 +11,9 @@
 <link rel="stylesheet" href="static/profile_page.css" />
 <link rel="stylesheet" href="static/progress_bar.css" />
 
-<div id="popup_background" class="blocked"></div>
+<div id="popup_background" class="blocked hidden"></div>
 
-<div id="change_password_dialogue" class="card static_center">
+<div id="change_password_dialogue" class="card static_center hidden">
     <div class="dialouge_title">Change Password</div>
     <button id="close_password_dialogue">X</button>
 
@@ -36,35 +36,44 @@
 
     <div>
         <label class="input_label">Current password</label><br />
-        <input
-            type="password"
-            id="current_password"
-            name="current_password"
-            placeholder=""
-            required
-        />
+        <div class="password_box">
+            <input
+                type="password"
+                id="current_password"
+                name="current_password"
+                placeholder=""
+                required
+            />
+            <button type="button" class="show_password_toggle closed"></button>
+        </div>
     </div>
 
     <div>
         <label class="input_label">New password</label><br />
-        <input
-            type="password"
-            id="new_password"
-            name="new_password"
-            placeholder=""
-            required
-        />
+        <div class="password_box">
+            <input
+                type="password"
+                id="new_password"
+                name="new_password"
+                placeholder=""
+                required
+            />
+            <button type="button" class="show_password_toggle closed"></button>
+        </div>
     </div>
 
     <div>
         <label class="input_label">New password (repeat)</label><br />
-        <input
-            type="password"
-            id="new_password_repeat"
-            name="new_password_repeat"
-            placeholder=""
-            required
-        />
+        <div class="password_box">
+            <input
+                type="password"
+                id="new_password_repeat"
+                name="new_password_repeat"
+                placeholder=""
+                required
+            />
+            <button type="button" class="show_password_toggle closed"></button>
+        </div>
     </div>
 
     <div>
@@ -216,3 +225,8 @@
     src="/static/javascript/handle_password_change.js"
     type="text/javascript"
 ></script>
+
+<script
+    src="/static/javascript/show_password.js"
+    type="text/javascript"
+></script>