diff --git a/app/views/registrar/domains/partials/_general.haml b/app/views/registrar/domains/partials/_general.haml
index 85cb78fd8..511847146 100644
--- a/app/views/registrar/domains/partials/_general.haml
+++ b/app/views/registrar/domains/partials/_general.haml
@@ -4,7 +4,7 @@
   .panel-body
     %dl.dl-horizontal
       %dt= t(:password)
-      %dd= @data.css('pw').text
+      %dd= @data.css('pw').text.present? ? @data.css('pw').text : t('hidden')
 
       %dt= t(:registrant)
       %dd= @data.css('registrant').text
diff --git a/app/views/registrar/domains/transfer_index.haml b/app/views/registrar/domains/transfer_index.haml
index 362fe19ab..502a3aab8 100644
--- a/app/views/registrar/domains/transfer_index.haml
+++ b/app/views/registrar/domains/transfer_index.haml
@@ -13,7 +13,7 @@
         .col-md-3.control-label
           = label_tag :password, t(:password), class: 'required'
         .col-md-7
-          = password_field_tag :password, params[:password],
+          = text_field_tag :password, params[:password],
             class: 'form-control', autocomplete: 'off', required: true
       .form-group
         .col-md-3.control-label
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e0fe3ef55..7d33957db 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -910,3 +910,4 @@ en:
   manage: Manage
   pending_epp: Pending epp
   id: ID
+  hidden: '[hidden]'