diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss
index c1ec1ee29..63451fa3b 100644
--- a/app/assets/stylesheets/admin.scss
+++ b/app/assets/stylesheets/admin.scss
@@ -244,10 +244,6 @@ $table-header:   #ecf1f6;
   text-decoration: underline;
 }
 
-.no-margin-bottom {
-  margin-bottom: 0 !important;
-}
-
 .enabled {
   color: $color-success;
 }
diff --git a/app/assets/stylesheets/management/account/edit_password_manually.scss b/app/assets/stylesheets/management/account/edit_password_manually.scss
new file mode 100644
index 000000000..c16816657
--- /dev/null
+++ b/app/assets/stylesheets/management/account/edit_password_manually.scss
@@ -0,0 +1,3 @@
+.no-margin-bottom {
+  margin-bottom: 0 !important;
+}
diff --git a/app/components/management/account/edit_password_manually_component.html.erb b/app/components/management/account/edit_password_manually_component.html.erb
new file mode 100644
index 000000000..d095757e1
--- /dev/null
+++ b/app/components/management/account/edit_password_manually_component.html.erb
@@ -0,0 +1,22 @@
+<h2 class="not-print"><%= t("management.account.menu.reset_password_manually") %></h2>
+
+<%= form_for user, url: change_password_management_account_path do |f| %>
+  <%= f.label :password %>
+  <p class="help-text"><%= t("management.account.edit.password.print_help") %></p>
+  <div class="small-12 medium-6">
+
+    <div class="input-group">
+      <%= f.password_field :password, class: "input-group-field no-margin-bottom", label: false, value: nil %>
+      <span class="input-group-label">
+        <a href="#" class="show-password"><span class="icon-eye"></span></a>
+      </span>
+    </div>
+
+    <%= link_to t("management.account.edit.password.random"),
+                "#",
+                class: "generate-random-value float-right",
+                data: { "password-complexity": User.password_complexity } %>
+  </div>
+
+  <%= f.submit t("management.account.edit.password.save"), class: "button success" %>
+<% end %>
diff --git a/app/components/management/account/edit_password_manually_component.rb b/app/components/management/account/edit_password_manually_component.rb
new file mode 100644
index 000000000..ab3bd1a99
--- /dev/null
+++ b/app/components/management/account/edit_password_manually_component.rb
@@ -0,0 +1,7 @@
+class Management::Account::EditPasswordManuallyComponent < ApplicationComponent
+  attr_reader :user
+
+  def initialize(user)
+    @user = user
+  end
+end
diff --git a/app/views/management/account/edit_password_manually.html.erb b/app/views/management/account/edit_password_manually.html.erb
index b86bafaa8..58b090529 100644
--- a/app/views/management/account/edit_password_manually.html.erb
+++ b/app/views/management/account/edit_password_manually.html.erb
@@ -1,22 +1 @@
-<h2 class="not-print"><%= t("management.account.menu.reset_password_manually") %></h2>
-
-<%= form_for managed_user, url: change_password_management_account_path do |f| %>
-  <%= f.label :password %>
-  <p class="help-text"><%= t("management.account.edit.password.print_help") %></p>
-  <div class="small-12 medium-6">
-
-    <div class="input-group">
-      <%= f.password_field :password, class: "input-group-field no-margin-bottom", label: false, value: nil %>
-      <span class="input-group-label">
-        <a href="#" class="show-password"><span class="icon-eye"></span></a>
-      </span>
-    </div>
-
-    <%= link_to t("management.account.edit.password.random"),
-                "#",
-                class: "generate-random-value float-right",
-                data: { "password-complexity": User.password_complexity } %>
-  </div>
-
-  <%= f.submit t("management.account.edit.password.save"), class: "button success" %>
-<% end %>
+<%= render Management::Account::EditPasswordManuallyComponent.new(managed_user) %>