diff --git a/app/assets/javascripts/sitewide/show_password.js b/app/assets/javascripts/sitewide/show_password.js
index 4f3bd21ec..f152e5182 100644
--- a/app/assets/javascripts/sitewide/show_password.js
+++ b/app/assets/javascripts/sitewide/show_password.js
@@ -1,6 +1,11 @@
 $(document).on('turbolinks:load', function() {
   $.each($('input[type="password"]'), function(i, e) {
-    $('<i class="fas fa-eye show-password" style="cursor: pointer; z-index: 10"></i>').insertAfter(e);
+    $(`<i class="fas fa-eye show-password"
+          style="
+            cursor: pointer;
+            z-index: 10;
+            top: ${$(e).position().top}px
+          "></i>`).insertAfter(e);
     $(e).parent().addClass('right-icon');
   });
 });
diff --git a/app/assets/stylesheets/shared/form_errors.scss b/app/assets/stylesheets/shared/form_errors.scss
new file mode 100644
index 000000000..d0ec643f0
--- /dev/null
+++ b/app/assets/stylesheets/shared/form_errors.scss
@@ -0,0 +1,6 @@
+.field_with_errors,
+.sci-input-container {
+  .help-block {
+    color: $brand-danger;
+  }
+}
diff --git a/app/assets/stylesheets/sign_up.scss b/app/assets/stylesheets/sign_up.scss
index 385f93697..76783bff6 100644
--- a/app/assets/stylesheets/sign_up.scss
+++ b/app/assets/stylesheets/sign_up.scss
@@ -25,7 +25,7 @@
         margin-bottom: 24px;
       }
 
-      .sci-input-container {
+      .sci-input-container:not(.field_with_errors) {
         margin-bottom: 24px;
 
         .minimum-password-length {
diff --git a/app/views/users/passwords/edit.html.erb b/app/views/users/passwords/edit.html.erb
index a3dc84f58..c33f82245 100644
--- a/app/views/users/passwords/edit.html.erb
+++ b/app/views/users/passwords/edit.html.erb
@@ -16,8 +16,9 @@
     <p class="sci-input-container">
       <%= f.label :password, t("devise.passwords.edit.password") %>
       <% if @minimum_password_length %>
-      <em><%= t("devise.passwords.edit.password_length", min_length: @minimum_password_length) %></em>
-      <% end %><br />
+        <em><%= t("devise.passwords.edit.password_length", min_length: @minimum_password_length) %></em>
+      <% end %>
+      <br>
       <%= f.password_field :password, autofocus: true, autocomplete: "off", class: "sci-input-field" %>
     </p>
 
diff --git a/config/application.rb b/config/application.rb
index 3502399c5..bf486722c 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -70,5 +70,9 @@ module Scinote
       # Only Authorization endpoint
       Doorkeeper::AuthorizationsController.layout 'sign_in_halt'
     end
+
+    config.action_view.field_error_proc = Proc.new { |html_tag, instance|
+      "<div class=\"field_with_errors sci-input-container\">#{html_tag}</div>".html_safe
+    }
   end
 end