diff --git a/app/services/auth.js b/app/services/auth.js
index dbea5d72..0487cfef 100644
--- a/app/services/auth.js
+++ b/app/services/auth.js
@@ -20,7 +20,7 @@ export default Ember.Service.extend({
   },
 
   endpoint: function() {
-    return config.apiEndpoint;
+    return config.authEndpoint || config.apiEndpoint;
   }.property(),
 
   signOut: function() {
diff --git a/config/environment.js b/config/environment.js
index 0e09d00c..e88cd3bc 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -61,6 +61,14 @@ module.exports = function(environment) {
         terms: ENV.billingEndpoint + "/pages/terms"
       };
     }
+
+    if (process.env.API_ENDPOINT) {
+      ENV.apiEndpoint = process.env.API_ENDPOINT;
+    }
+
+    if (process.env.AUTH_ENDPOINT) {
+      ENV.authEndpoint = process.env.AUTH_ENDPOINT;
+    }
   }
 
   if (environment === 'development') {