diff --git a/include/library/Crunchbutton/App.php b/include/library/Crunchbutton/App.php
index 7761bd21b..0877668a5 100755
--- a/include/library/Crunchbutton/App.php
+++ b/include/library/Crunchbutton/App.php
@@ -18,6 +18,8 @@ class Crunchbutton_App extends Cana_App {
 			$cli = true;
 		}
 
+		$_SERVER['HTTP_HOST_CALLBACK'] = $_SERVER['__HTTP_HOST'];
+
 		$params['postInitSkip'] = true;
 		switch ($_SERVER['__HTTP_HOST']) {
 			case 'staging.crunchr.co':
@@ -80,17 +82,11 @@ class Crunchbutton_App extends Cana_App {
 							case '/home/dev.crunchbutton/include/library/Crunchbutton':
 								$params['env'] = 'beta';
 								$_SERVER['__HTTP_HOST'] = 'beta.crunchr.co';
-								$_SERVER['HTTP_HOST_CALLBACK'] = 'beta.crunchr.co';
 								break;
 							case '/home/crunchbutton/include/library/Crunchbutton':
-									$params['env'] = 'live';
-									$_SERVER['__HTTP_HOST'] = '_DOMAIN_';
-									$_SERVER['HTTP_HOST_CALLBACK'] = 'crunchbutton.co';
-								break;
 							case '/home/staging.crunchbutton/include/library/Crunchbutton':
-									$params['env'] = 'live';
-									$_SERVER['__HTTP_HOST'] = '_DOMAIN_';
-									$_SERVER['HTTP_HOST_CALLBACK'] = 'staging.crunchbutton.co';
+								$params['env'] = 'live';
+								$_SERVER['__HTTP_HOST'] = '_DOMAIN_';
 								break;
 							default:
 								$params['env'] = 'local';