diff --git a/base/univention-system-setup/usr/share/univention-system-setup/www/ApplianceWizard.js b/base/univention-system-setup/usr/share/univention-system-setup/www/ApplianceWizard.js
index 804974af89..f40face29c 100644
--- a/base/univention-system-setup/usr/share/univention-system-setup/www/ApplianceWizard.js
+++ b/base/univention-system-setup/usr/share/univention-system-setup/www/ApplianceWizard.js
@@ -1667,7 +1667,7 @@ define([
 			var role = values['server/role'];
 			return this.uidIsUsable(uid, role).then(
 				function(data) { return true; },  // callback; uid is available, just continue
-				this.getConfirmationToContinueWithDuplicateHostname.bind(null, hostname)  // errback
+				this.getConfirmationToContinueWithDuplicateHostname(hostname)
 			);
 		},
 
@@ -1689,17 +1689,15 @@ define([
 				hostname
 			), [{
 				label: _('Adjust settings'),
-				name: 'stay'
+				name: 'adjust_settings'
 			}, {
 				label: _('Continue with duplicate hostname'),
 				'default': true,
 				name: 'continue'
-			}], _('Warning')).then(
-				function(choice) {
-					if (choice == 'continue') { return choice; }
-					throw choice;
-				}
-			);
+			}], _('Warning')).then(lang.hitch(this, function(choice) {
+				if (choice == 'continue') { return choice; }
+				this.selectChild(this._pages.role)
+			}));
 		},
 
 		_updateAppGallery: function() {