diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 625269a2..ecdd0474 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -251,6 +251,11 @@ textarea#comment_content {
   text-align: right;
 }
 
+#password_boolean {
+  margin-top: 4px;
+  width: 20px;
+}
+
 /* comments */
 
 .comment_author {
diff --git a/mediagoblin/templates/mediagoblin/auth/register.html b/mediagoblin/templates/mediagoblin/auth/register.html
index bded1d7e..73eae0d8 100644
--- a/mediagoblin/templates/mediagoblin/auth/register.html
+++ b/mediagoblin/templates/mediagoblin/auth/register.html
@@ -22,7 +22,7 @@
 {% block mediagoblin_head %}
   <script>
     $(document).ready(function(){
-      $("#password").after('<input type="text" value="" name="password_clear" id="password_clear" /><input type="checkbox" id="password_boolean" />Show password');
+      $("#password").after('<input type="text" value="" name="password_clear" id="password_clear" /><label><input type="checkbox" id="password_boolean" />Show password</label>');
       $('#password_clear').hide();
       $('#password_boolean').click(function(){
         if($('#password_boolean').prop("checked")) {
@@ -35,6 +35,10 @@
           $('#password').show();
         };
       });
+      $('#password,#password_clear').keyup(function(){
+        $('#password').val($(this).val());
+        $('#password_clear').val($(this).val());
+      });
     });
   </script>
 {% endblock mediagoblin_head %}