diff --git a/framework/core/ember/app/adapters/application.js b/framework/core/ember/app/adapters/application.js
index ec39c711d..bc8290e58 100644
--- a/framework/core/ember/app/adapters/application.js
+++ b/framework/core/ember/app/adapters/application.js
@@ -1,8 +1,9 @@
 import JsonApiAdapter from 'ember-json-api/json-api-adapter';
+import config from '../config/environment';
 
 export default JsonApiAdapter.extend({
 
 	// Todo: make this loaded via an environment variable or something
-	host: '/api'
+	host: config.apiURL
 	
 });
\ No newline at end of file
diff --git a/framework/core/ember/config/environment.js b/framework/core/ember/config/environment.js
index 3a276770c..097618245 100644
--- a/framework/core/ember/config/environment.js
+++ b/framework/core/ember/config/environment.js
@@ -5,6 +5,7 @@ module.exports = function(environment) {
     modulePrefix: 'flarum',
     environment: environment,
     baseURL: '/',
+    apiURL: '/api',
     locationType: 'hash',
     EmberENV: {
       FEATURES: {
@@ -31,6 +32,7 @@ module.exports = function(environment) {
     // Testem prefers this...
     ENV.baseURL = '/';
     ENV.locationType = 'none';
+    ENV.apiURL = 'http://flarum.dev/api',
 
     // keep test console output quieter
     ENV.APP.LOG_ACTIVE_GENERATION = false;
diff --git a/framework/core/src/Flarum/Api/Actions/Base.php b/framework/core/src/Flarum/Api/Actions/Base.php
index dadf70120..a90b75602 100644
--- a/framework/core/src/Flarum/Api/Actions/Base.php
+++ b/framework/core/src/Flarum/Api/Actions/Base.php
@@ -142,8 +142,8 @@ abstract class Base extends Controller
 
     protected function respondWithArray($array, $statusCode = 200, $headers = [])
     {
-        // @todo remove this
-        $headers['Access-Control-Allow-Origin'] = 'http://0.0.0.0:4200';
+        // @todo remove this?
+        $headers['Access-Control-Allow-Origin'] = '*';
 
         return Response::json($array, $statusCode, $headers);
     }
diff --git a/framework/core/src/views/index.blade.php b/framework/core/src/views/index.blade.php
index 6befa5b63..d6463b335 100644
--- a/framework/core/src/views/index.blade.php
+++ b/framework/core/src/views/index.blade.php
@@ -9,8 +9,8 @@
     <meta name="mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-capable" content="yes">
 
-    <meta name="flarum/config/environment" content="%7B%22modulePrefix%22%3A%22flarum%22%2C%22environment%22%3A%22development%22%2C%22baseURL%22%3A%22/%22%2C%22locationType%22%3A%22hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%7D%2C%22APP%22%3A%7B%22LOG_ACTIVE_GENERATION%22%3Atrue%2C%22LOG_VIEW_LOOKUPS%22%3Atrue%7D%2C%22contentSecurityPolicyHeader%22%3A%22Content-Security-Policy-Report-Only%22%2C%22contentSecurityPolicy%22%3A%7B%22default-src%22%3A%22%27none%27%22%2C%22script-src%22%3A%22%27self%27%20%27unsafe-eval%27%22%2C%22font-src%22%3A%22%27self%27%22%2C%22connect-src%22%3A%22%27self%27%22%2C%22img-src%22%3A%22%27self%27%22%2C%22style-src%22%3A%22%27self%27%22%2C%22media-src%22%3A%22%27self%27%22%7D%2C%22exportApplicationGlobal%22%3Atrue%7D" />
-
+    <meta name="flarum/config/environment" content="%7B%22modulePrefix%22%3A%22flarum%22%2C%22environment%22%3A%22development%22%2C%22baseURL%22%3A%22/%22%2C%22apiURL%22%3A%22/api%22%2C%22locationType%22%3A%22hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%7D%2C%22APP%22%3A%7B%7D%2C%22contentSecurityPolicyHeader%22%3A%22Content-Security-Policy-Report-Only%22%2C%22contentSecurityPolicy%22%3A%7B%22default-src%22%3A%22%27none%27%22%2C%22script-src%22%3A%22%27self%27%20%27unsafe-eval%27%22%2C%22font-src%22%3A%22%27self%27%22%2C%22connect-src%22%3A%22%27self%27%22%2C%22img-src%22%3A%22%27self%27%22%2C%22style-src%22%3A%22%27self%27%22%2C%22media-src%22%3A%22%27self%27%22%7D%2C%22exportApplicationGlobal%22%3Atrue%7D" />
+    
     <base href="/">
 
     {{ app('flarum.web.assetManager')->styles() }}