diff --git a/Gemfile b/Gemfile
index 35fd20a2bffa2166a590b58e180a7fc64e69f252..263aaa73204858398c07dd99efb3f5213057e170 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,6 +21,7 @@ gem 'devise'
 gem 'devise-i18n'
 gem 'cancancan'
 gem 'simple_form'
+gem 'simple_form_password_with_hints'
 gem 'enum_help'
 gem 'enum-i18n'
 gem 'country_select'
diff --git a/Gemfile.lock b/Gemfile.lock
index b65a8cb7c5b95783c4bfe76a14579747e8cd5e4f..43a23ba5bc15187d8d71c0a828b6a7e0693ef3e5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -314,6 +314,9 @@ GEM
     simple_form (5.1.0)
       actionpack (>= 5.2)
       activemodel (>= 5.2)
+    simple_form_password_with_hints (0.0.2)
+      rails
+      simple_form
     sinatra (2.1.0)
       mustermann (~> 1.0)
       rack (~> 2.2)
@@ -395,6 +398,7 @@ DEPENDENCIES
   sib-api-v3-sdk
   simple-navigation
   simple_form
+  simple_form_password_with_hints
   spring
   two_factor_authentication!
   tzinfo-data
@@ -405,4 +409,4 @@ RUBY VERSION
    ruby 2.7.4p191
 
 BUNDLED WITH
-   2.2.24
+   2.2.27
diff --git a/app/assets/javascripts/admin.js b/app/assets/javascripts/admin.js
index 07f66cdd856a2f5a53936de2fb244f24ea98ddd5..3e5e3ac515b714cb685aa9f55b93aa1179e9e840 100644
--- a/app/assets/javascripts/admin.js
+++ b/app/assets/javascripts/admin.js
@@ -1,3 +1,5 @@
 //= require jquery3
 //= require jquery_ujs
 //= require appstack/app
+
+//= require simple_form_password_with_hints
diff --git a/app/assets/stylesheets/admin.sass b/app/assets/stylesheets/admin.sass
index d484bedaa6470925a3a405c85b84f9d7999b70a5..eac54bc360073809d52ff5ae788b771d82b6aedf 100644
--- a/app/assets/stylesheets/admin.sass
+++ b/app/assets/stylesheets/admin.sass
@@ -1,2 +1,3 @@
 @import 'appstack/light'
+@import 'simple_form_password_with_hints'
 @import 'admin/*'
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 7e926c2d16d945400560d023caedd882286054a8..db3f81f6a1f0c04e0035b8f34a9b589d50af909a 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -7,6 +7,8 @@
                 autofocus: true,
                 input_html: { autocomplete: "email" } %>
     <%= f.input :password,
+                as: :password_with_hints,
+                allow_password_uncloaking: true,
                 required: false,
                 input_html: { autocomplete: "current-password" } %>
     <%= f.input :remember_me, as: :boolean if devise_mapping.rememberable? %>
diff --git a/lib/tasks/.keep b/lib/tasks/.keep
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000