diff --git a/modules/hosting/package/hosting_package.install b/modules/hosting/package/hosting_package.install
index a4ea640..9785217 100644
--- a/modules/hosting/package/hosting_package.install
+++ b/modules/hosting/package/hosting_package.install
@@ -331,3 +331,14 @@ function hosting_package_update_6001() {
   return $ret;
 }
 
+// Set the hostmaster or hostslave profile packages to status = 1 in the node table per #599758
+function hosting_package_update_6002() {
+  $ret = array();
+  $result = db_query("SELECT h.nid FROM {hosting_package} h JOIN {node} n ON n.nid = h.nid 
+                      WHERE h.short_name = 'hostmaster' OR h.short_name = 'hostslave';");
+  while ($package = db_fetch_array($result)) {
+    db_query("UPDATE {node} SET status = %d WHERE nid = %d", 1, $package['nid']);
+  }
+  return $ret;
+}
+
diff --git a/modules/hosting/package/hosting_package.module b/modules/hosting/package/hosting_package.module
index 7494ddd..214b311 100644
--- a/modules/hosting/package/hosting_package.module
+++ b/modules/hosting/package/hosting_package.module
@@ -310,14 +310,7 @@ function hosting_package_sync(&$data) {
         $package->package_type = $type;
         $package->short_name = $short_name;
         $package->description = $file['description'];
-        // Kludge to hide the hostmaster and hostslave profiles
-        if (($type == 'profile') 
-          && in_array($short_name, array('hostslave', 'hostmaster'))) {
-          $package->status = 0;
-        }
-        else {
-          $package->status = 1;
-        }
+        $package->status = 1;
         node_save($package);
       }
 
diff --git a/modules/hosting/site/hosting_site.module b/modules/hosting/site/hosting_site.module
index 835e67d..f77e7e9 100644
--- a/modules/hosting/site/hosting_site.module
+++ b/modules/hosting/site/hosting_site.module
@@ -878,6 +878,11 @@ function hosting_site_menu() {
  */
 function _hosting_site_form_profile($platform = NULL) {
   $profiles = hosting_get_profiles($platform);
+  foreach($profiles as $id => $name) {
+    if (in_array($name, array('hostmaster', 'hostslave'))) {
+      unset($profiles[$id]);
+    }
+  }
   if (sizeof($profiles) > 1) {
     $form['profile'] = array(
       '#type' => 'radios',