diff --git a/install.hostmaster.inc b/install.hostmaster.inc
index fd0085a34dee4daedaacab8b98a09546b106b44b..38b6b2be04db7394b904273ac7107fbaf3fa3dab 100644
--- a/install.hostmaster.inc
+++ b/install.hostmaster.inc
@@ -26,6 +26,10 @@ function drush_provision_hostmaster_install($site) {
     'site_port' => drush_get_option('web_port', 80)),
     'GET', TRUE
   );
-  drush_print('Login link is ' . $data['context']['login_link']);
+
+  drush_print("Initializing the hosting system");
+  drush_backend_invoke('hosting-setup', array('uri' => $site, 'root' => $platform));
+  
+  drush_print(dt("Aegir is now installed. You can visit it at @link", array('@link' => $data['context']['login_link'])));
 }
 
diff --git a/install.sh.txt b/install.sh.txt
index 23202c585604c202060976d3b83ac2f4d7900cd5..1fa69c3a60b794f09d5dd5f2abaf9b08d8491501 100644
--- a/install.sh.txt
+++ b/install.sh.txt
@@ -206,11 +206,5 @@ if [ ! -d $HOSTMASTER_DIR ] ; then
   $DRUSH hostmaster-make $HOSTMASTER_DIR
 
   msg "Installing hostmaster"
-  $DRUSH hostmaster-install --root="$HOSTMASTER_DIR" $AEGIR_DOMAIN
-
-  msg "Initializing the hosting system"
-  $DRUSH hosting-setup --root="$HOSTMASTER_DIR" --uri="$AEGIR_DOMAIN" -y
-  
+  $DRUSH hostmaster-install --root="$HOSTMASTER_DIR" $AEGIR_DOMAIN  
 fi
-
-msg "Aegir is now installed. You can visit it at http://$AEGIR_DOMAIN"