diff --git a/library/language/source/main.php b/library/language/source/main.php
index 00ad2b93c..106eb91b7 100644
--- a/library/language/source/main.php
+++ b/library/language/source/main.php
@@ -25,6 +25,7 @@ $lang['POSTS_SHORT'] = 'Posts';
 $lang['POSTED'] = 'Posted';
 $lang['USERNAME'] = 'Username';
 $lang['PASSWORD'] = 'Password';
+$lang['PASSWORD_SHOW_BTN'] = 'Show password';
 $lang['EMAIL'] = 'Email';
 $lang['PM'] = 'PM';
 $lang['AUTHOR'] = 'Author';
diff --git a/styles/templates/default/login.tpl b/styles/templates/default/login.tpl
index 52acf22df..0c6143775 100644
--- a/styles/templates/default/login.tpl
+++ b/styles/templates/default/login.tpl
@@ -26,7 +26,7 @@
 	</tr>
 	<tr>
 		<td align="right">{L_PASSWORD}:</td>
-		<td><input type="password" class="post" name="login_password" value="{LOGIN_PASSWORD}" tabindex="102" size="25" maxlength="32" /></td>
+		<td><input type="password" class="post show_pass_input" name="login_password" value="{LOGIN_PASSWORD}" tabindex="102" size="25" maxlength="32" />&nbsp;<label><input type="checkbox" class="password_show_checkbox">&nbsp;{L_PASSWORD_SHOW_BTN}</label></td>
 	</tr>
 	<!-- IF CAPTCHA_HTML -->
 	<tr>
diff --git a/styles/templates/default/page_footer.tpl b/styles/templates/default/page_footer.tpl
index 424294d0f..bc4b510bb 100644
--- a/styles/templates/default/page_footer.tpl
+++ b/styles/templates/default/page_footer.tpl
@@ -66,6 +66,16 @@
 
 <script type="text/javascript">new ClipboardJS('.copyElement');</script>
 
+<script type="text/javascript">
+    $('body').on('click', '.password_show_checkbox', function () {
+        if ($(this).is(':checked')) {
+            $('input.show_pass_input').attr('type', 'text');
+        } else {
+            $('input.show_pass_input').attr('type', 'password');
+        }
+    });
+</script>
+
 <!-- IF ONLOAD_FOCUS_ID -->
 <script type="text/javascript">
 $p('{ONLOAD_FOCUS_ID}').focus();
diff --git a/styles/templates/default/usercp_register.tpl b/styles/templates/default/usercp_register.tpl
index 401df9b9a..98150f330 100644
--- a/styles/templates/default/usercp_register.tpl
+++ b/styles/templates/default/usercp_register.tpl
@@ -73,7 +73,7 @@ document.write('<input type="hidden" name="user_timezone" value="'+tz+'" />');
 <!-- IF EDIT_PROFILE and not ADM_EDIT -->
 <tr>
 	<td class="prof-title">{L_CURRENT_PASSWORD}: * <br /><h6>{L_CONFIRM_PASSWORD_EXPLAIN}</h6></td>
-	<td><input type="password" name="cur_pass" size="35" maxlength="32" value="" /></td>
+	<td><input class="show_pass_input" type="password" name="cur_pass" size="35" maxlength="32" value="" />&nbsp;<label><input type="checkbox" class="password_show_checkbox">&nbsp;{L_PASSWORD_SHOW_BTN}</label></td>
 </tr>
 <!-- ENDIF -->
 <tr>