diff --git a/obp-api/src/main/resources/props/sample.props.template b/obp-api/src/main/resources/props/sample.props.template
index 42096a5d6..22ad82fbe 100644
--- a/obp-api/src/main/resources/props/sample.props.template
+++ b/obp-api/src/main/resources/props/sample.props.template
@@ -403,6 +403,7 @@ oauth2_server_url =
 #webui_signup_form_submit_button_value=
 #webui_signup_form_title_text=Sign Up
 #webui_signup_body_password_repeat_text=Repeat 
+#allow_pre_filled_password=true
 #webui_agree_terms_html=<div id="signup-agree-terms" class="checkbox"><label><input type="checkbox" />I hereby agree to the <a href="$url" title="T &amp; C">Terms and Conditions</a></label></div>
 webui_agree_privacy_policy_url = https://openbankproject.com/privacy-policy
 webui_agree_privacy_policy_html_text =<div id="signup-agree-privacy-policy"><label>By submitting this information you consent to processing your data by TESOBE GmbH according to our <a href="$url" title="Privacy Policy">Privacy Policy</a>. TESOBE shall use this information to send you emails and provide customer support.</label></div>
diff --git a/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala b/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala
index 956f0bc58..92a399f56 100644
--- a/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala
+++ b/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala
@@ -127,20 +127,20 @@ class AuthUser extends MegaProtoUser[AuthUser] with MdcLoggable {
 
   override lazy val password = new MyPasswordNew
   
-  def signupPasswordRepeatText = getWebUiPropsValue("webui_signup_body_password_repeat_text", S.?("repeat"))
-  
+  lazy val signupPasswordRepeatText = getWebUiPropsValue("webui_signup_body_password_repeat_text", S.?("repeat"))
+ 
   class MyPasswordNew extends MappedPassword(this) {
-
+    lazy val preFilledPassword = if (APIUtil.getPropsAsBoolValue("allow_pre_filled_password", true)) {get.toString} else ""
     override def _toForm: Box[NodeSeq] = {
       S.fmapFunc({s: List[String] => this.setFromAny(s)}){funcName =>
         Full(
           <span>
-            {appendFieldId(<input id="textPassword" type={formInputType} name={funcName} value={get.toString}/>)}
+            {appendFieldId(<input id="textPassword" type={formInputType} name={funcName} value={preFilledPassword}/>)}
             <div id="signup-error" class="alert alert-danger hide">
               <span data-lift={s"Msg?id=${uniqueFieldId.getOrElse("")}&errorClass=error"}/>
             </div>
             <div id ="repeat-password">{signupPasswordRepeatText}</div>
-            <input id="textPasswordRepeat" type={formInputType} name={funcName} value={get.toString}/>
+            <input id="textPasswordRepeat" type={formInputType} name={funcName} value={preFilledPassword}/>
             <div id="signup-error" class="alert alert-danger hide">
               <span data-lift={s"Msg?id=${uniqueFieldId.getOrElse("")}_repeat&errorClass=error"}/>
             </div>