diff --git a/app/views/admin/domains/partials/_general.html.erb b/app/views/admin/domains/partials/_general.html.erb
index ff4ea6bbd..64dbd7336 100644
--- a/app/views/admin/domains/partials/_general.html.erb
+++ b/app/views/admin/domains/partials/_general.html.erb
@@ -15,8 +15,11 @@
             <dt><%= t(:registrar_name) %></dt>
             <dd><%= link_to(@domain.registrar, admin_registrar_path(@domain.registrar)) %></dd>
 
-            <dt><%= t(:authinfo_pw) %></dt>
-            <dd><%= text_field_tag :password, @domain.auth_info, readonly: true, class: 'partially-hidden' %></dd>
+            <dt><%= Domain.human_attribute_name :auth_info %></dt>
+            <dd>
+                <%= tag :input, type: 'text', value: @domain.auth_info, readonly: true,
+                        class: 'form-control input-sm' %>
+            </dd>
 
             <dt><%= t(:valid_from) %></dt>
             <dd><%= l(@domain.valid_from) %></dd>
diff --git a/app/views/registrant/domains/partials/_general.html.erb b/app/views/registrant/domains/partials/_general.html.erb
index 57dea3e30..3d3fd6ee1 100644
--- a/app/views/registrant/domains/partials/_general.html.erb
+++ b/app/views/registrant/domains/partials/_general.html.erb
@@ -15,8 +15,11 @@
             <dt><%= t(:registrar_name) %></dt>
             <dd><%= link_to(@domain.registrar, registrant_registrar_path(@domain.registrar)) %></dd>
 
-            <dt><%= t(:authinfo_pw) %></dt>
-            <dd><%= text_field_tag :password, @domain.auth_info, readonly: true, class: 'partially-hidden' %></dd>
+            <dt><%= Domain.human_attribute_name :auth_info %></dt>
+            <dd>
+                <%= tag :input, type: 'text', value: @domain.auth_info, readonly: true,
+                        class: 'form-control input-sm' %>
+            </dd>
 
             <dt><%= t(:valid_from) %></dt>
             <dd><%= l(@domain.valid_from) %></dd>
diff --git a/app/views/registrar/domains/partials/_general.html.erb b/app/views/registrar/domains/partials/_general.html.erb
index 7d878bba9..45cae00e6 100644
--- a/app/views/registrar/domains/partials/_general.html.erb
+++ b/app/views/registrar/domains/partials/_general.html.erb
@@ -7,8 +7,14 @@
 
     <div class="panel-body">
         <dl class="dl-horizontal">
-            <dt><%= t(:authinfo_pw) %></dt>
-            <dd><%= @data.css('pw').text.present? ? @data.css('pw').text : t('hidden') %></dd>
+            <dt><%= Domain.human_attribute_name :auth_info %></dt>
+            <dd>
+                <% if @data.css('pw').text.present? %>
+                    <%= tag(:input, type: 'text', value: @data.css('pw').text, readonly: true,
+                            class: 'form-control input-sm') %>
+                <% end %>
+            </dd>
+
 
             <% if @data.css('pw').text.blank? %>
                 <dt><%= t(:registrar_name) %></dt>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 12f1f113a..5a3564411 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -804,7 +804,6 @@ en:
   manage: Manage
   pending_epp: Pending epp
   id: ID
-  hidden: '[hidden]'
   created_at_from: 'Created at from'
   created_at_until: 'Created at until'
   is_registrant: 'Is registrant'