diff --git a/modules/hosting/alias/hosting_alias.install b/modules/hosting/alias/hosting_alias.install
index 91e2360..4f1bc35 100644
--- a/modules/hosting/alias/hosting_alias.install
+++ b/modules/hosting/alias/hosting_alias.install
@@ -32,9 +32,9 @@ function hosting_alias_schema() {
         'default' => 0,
       ),
       'redirection' => array(
-        'type' => 'varchar', 
-        'length' => 255, 
-        'not null' => TRUE, 
+        'type' => 'varchar',
+        'length' => 255,
+        'not null' => TRUE,
       ),
     ),
     'indexes' => array(
diff --git a/modules/hosting/alias/hosting_alias.module b/modules/hosting/alias/hosting_alias.module
index 44401c2..978450a 100644
--- a/modules/hosting/alias/hosting_alias.module
+++ b/modules/hosting/alias/hosting_alias.module
@@ -29,9 +29,9 @@ function hosting_alias_menu() {
     'type' => MENU_LOCAL_TASK
   );
   $items['hosting_alias/js'] = array(
-    'title' => 'Javascript Alias Form', 
-    'page callback' => 'hosting_alias_form_js', 
-    'access arguments' => array('access content'), 
+    'title' => 'Javascript Alias Form',
+    'page callback' => 'hosting_alias_form_js',
+    'access arguments' => array('access content'),
     'type' => MENU_CALLBACK,
   );
   return $items;
@@ -86,22 +86,22 @@ function hosting_alias_form_data(&$form, &$form_state) {
         '#weight' => 10,
       );
     }
-    
+
     // Add a wrapper for the aliases and more button.
     $form['aliases_wrapper'] = array(
       '#tree' => FALSE,
       '#title' => t('Domain Aliases'),
       '#type' => 'fieldset',
-      '#prefix' => '<div class="clear-block" id="hosting-aliases-wrapper">', 
+      '#prefix' => '<div class="clear-block" id="hosting-aliases-wrapper">',
       '#suffix' => '</div>',
     );
     $form['aliases_wrapper']['aliases'] = array(
-      '#prefix' => '<div id="hosting-aliases">', 
+      '#prefix' => '<div id="hosting-aliases">',
       '#suffix' => '</div>',
-      '#tree' => TRUE,      
+      '#tree' => TRUE,
      // '#theme' => 'hosting_alias_form',
     );
-    
+
     // Get the list of existing aliases, either from form_state or the node.
     if (isset($form_state['aliases'])) {
       $aliases = array_filter($form_state['aliases']);
@@ -109,15 +109,15 @@ function hosting_alias_form_data(&$form, &$form_state) {
     else {
       $aliases = array_filter($form['#node']->aliases);
     }
-    
+
     // Figure out the alias count
     if (isset($form_state['alias_count'])) {
       $alias_count = $form_state['alias_count'] + 1;
     }
     else {
-      $alias_count = max(2, empty($aliases) ? 2 : count($aliases) + 1);
+      $alias_count = max(1, empty($aliases) ? 1 : count($aliases) + 1);
     }
-    
+
     // Add alias textfields
     for ($delta = 0; $delta < $alias_count; $delta++) {
       $form['aliases_wrapper']['aliases'][$delta] = array(
@@ -125,7 +125,7 @@ function hosting_alias_form_data(&$form, &$form_state) {
         '#default_value' => $aliases[$delta],
       );
     }
-    
+
     // "Add Alias" button
     $form['aliases_wrapper']['add_alias'] = array(
       '#type' => 'submit',
@@ -145,11 +145,15 @@ function hosting_alias_form_data(&$form, &$form_state) {
     $options = array();
     $options[0] = t('No redirection');
     $options[$form['#node']->title] = $form['#node']->title;
-    $options += array_combine($aliases, $aliases);
-    $options += array_combine($automatic_aliases, $automatic_aliases);
+    if (!empty($aliases)) {
+      $options += array_combine($aliases, $aliases);
+    }
+    if (!empty($automatic_aliases)) {
+      $options += array_combine($automatic_aliases, $automatic_aliases);
+    }
+
+    $default = isset($form_state['values']['redirection']) ? $form_state['values']['redirection'] : $form['#node']->redirection;
 
-    $default = isset($form_state['values']['redirection'])? $form_state['values']['redirection']: $form['#node']->redirection;
-    
     $form['aliases_wrapper']['redirection'] = array(
       '#type' => 'select',
       '#title' => t('Redirect all domain aliases to'),
@@ -167,7 +171,7 @@ function hosting_alias_form_data(&$form, &$form_state) {
 function hosting_alias_add_alias_submit($form, &$form_state) {
   // Set the form to rebuild and run submit handlers.
   node_form_submit_build_node($form, $form_state);
-  
+
   // Make the changes we want to the form state.
   if ($form_state['values']['add_alias']) {
     $form_state['values']['aliases'] = array_filter($form_state['values']['aliases']);
@@ -342,10 +346,10 @@ function hosting_alias_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
             }
           }
         }
-        
-        //Make sure chosen redirect is still an alias
-        if (!in_array($node->redirection, $aliases)){
-          form_set_error('redirection', t('The domain name @alias is not an alias for this site.', array('@alias' => $alias)));
+
+        // Make sure chosen redirect is still an alias
+        if ($node->redirection != 0 && !in_array($node->redirection, $aliases) && !($node->redirection == $node->title)) {
+          form_set_error('redirection', t('The domain name @alias is not an alias for this site.', array('@alias' => $node->redirection)));
         }
         break;
       case 'load':
@@ -375,7 +379,7 @@ function hosting_alias_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
           $node->content['info']['redirection'] = array(
             '#type' => 'item',
             '#title' => t('Redirection Target'),
-            '#value' => !empty($redirection) ? l($redirection, "http://$redirection") : t('None'), 
+            '#value' => !empty($redirection) ? l($redirection, "http://$redirection") : t('None'),
             '#weight' => 10,
           );
         }