diff --git a/alias/hosting_alias.module b/alias/hosting_alias.module
index 642098d..7ad90c0 100644
--- a/alias/hosting_alias.module
+++ b/alias/hosting_alias.module
@@ -466,6 +466,18 @@ function hosting_alias_settings($form, &$form_state) {
     '#description' => t('To be able to provide a temporary url for your sites, you need to have configured a wild card dns entry<br /> resolving all calls to subdomains of your chosen domain, to point at your web server.'),
     '#default_value' => variable_get('hosting_alias_subdomain', ''),
   );
+  $form['hosting_alias_subdomain_replace_dash'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Replace dashes'),
+    '#description' => t('Replace dashes in automatic subdomain aliases. Changes only take effect when a site is verified.'),
+    '#default_value' => variable_get('hosting_alias_subdomain_replace_dash', TRUE),
+  );
+  $form['hosting_alias_subdomain_dash_substitute'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Dash substitute'),
+    '#description' => t('Dashes in automatic subdomain aliases will be replaced with the given value. Changes only take effect when a site is verified.'),
+    '#default_value' => variable_get('hosting_alias_subdomain_dash_substitute', '--'),
+  );
   $form['hosting_alias_automatic_www'] = array(
     '#type' => 'checkbox',
     '#title' => t('Generate www.domain.com alias automatically'),
@@ -505,7 +517,13 @@ function hosting_alias_automatic_aliases($url) {
   $alias = array();
   if ($sub = variable_get('hosting_alias_subdomain', FALSE)) {
     if (!preg_match("/\." . preg_quote($sub, '/') . "$/", $url)) {
-      $alias[] = str_replace(array('-', '.'), array('--', '-'), $url) . "." . trim($sub, ".");
+      if (variable_get('hosting_alias_subdomain_replace_dash', TRUE)) {
+        $find[] = '-';
+        $replace[] = variable_get('hosting_alias_subdomain_dash_substitute', '--');
+      }
+      $find[] = '.';
+      $replace[] = '-';
+      $alias[] = str_replace($find, $replace, $url) . "." . trim($sub, ".");
     }
   }
   if (!preg_match('/^www\./', $url) && variable_get('hosting_alias_automatic_www', FALSE)) {