diff --git a/murano-apps/Gerrit/package/Resources/scripts/create_account.sh b/murano-apps/Gerrit/package/Resources/scripts/create_account.sh
index 795615b..9df4bb4 100644
--- a/murano-apps/Gerrit/package/Resources/scripts/create_account.sh
+++ b/murano-apps/Gerrit/package/Resources/scripts/create_account.sh
@@ -14,5 +14,14 @@ NAME="$6"
 
 HOSTNAME="`hostname -f`"
 
-su gerrit2 -c "ssh -p 29418 -i /home/gerrit2/review_site/etc/ssh_project_rsa_key project-creator@$HOSTNAME "`
- `"gerrit create-account --group \'${GROUP}\' --full-name \'${FULL_NAME}\' --email $EMAIL --ssh-key \'${SSHKEY}\' $NAME"
\ No newline at end of file
+set +e
+su gerrit2 -c "ssh -p 29418 -i /home/gerrit2/review_site/etc/ssh_project_rsa_key project-creator@$HOSTNAME \
+gerrit create-account --group \'${GROUP}\' --full-name \'${FULL_NAME}\' --email $EMAIL --ssh-key \'${SSHKEY}\' $NAME"
+
+code=$?
+
+if [ $code -ne 0 ]; then
+  # Do not create account but set related properties.
+  su gerrit2 -c "ssh -p 29418 -i /home/gerrit2/review_site/etc/ssh_project_rsa_key project-creator@$HOSTNAME \
+  gerrit set-account --full-name \'${FULL_NAME}\' --add-email $EMAIL --add-ssh-key \'${SSHKEY}\' $NAME"
+fi
\ No newline at end of file