# This patch file was generated by NetBeans IDE
# This patch can be applied using context Tools: Apply Diff Patch action on respective folder.
# It uses platform neutral UTF-8 encoding.
# Above lines and this line are ignored by the patching process.
--- components/com_comprofiler/plugin/user/plug_cbcore/cb.core.php
+++ components/com_comprofiler/plugin/user/plug_cbcore/cb.core.php
@@ -589,12 +589,12 @@
 	 * @param  string                $reason    'edit' for save profile edit, 'register' for registration, 'search' for searches
 	 */
 	function prepareFieldDataSave( &$field, &$user, &$postdata, $reason ) {
-		global $ueConfig;
+		global $_CB_framework, $ueConfig;
 
 		$this->_prepareFieldMetaSave( $field, $user, $postdata, $reason );
 
 		// For CB main password don't save if it's on registration and passwords are auto-generated.
-		if ( ( $reason == 'register' ) && ( $field->name == 'password' ) ) {
\ No newline at end of file
+		if ( ( ( $reason == 'register' ) || ( ( $_CB_framework->getUi() == 2 ) && ( ! $user->id ) ) ) && ( $field->name == 'password' ) ) {
\ No newline at end of file
 			if ( isset( $ueConfig['emailpass'] ) && ( $ueConfig['emailpass'] == "1" ) ) {
 				return;
 			}