diff --git a/build/actions/auth.js b/build/actions/auth.js
index 9f6f6c48..cd80e5b6 100644
--- a/build/actions/auth.js
+++ b/build/actions/auth.js
@@ -1,5 +1,5 @@
 (function() {
-  var TOKEN_URL, _, async, open, resin, url, visuals;
+  var TOKEN_URL, _, async, open, resin, settings, url, visuals;
 
   open = require('open');
 
@@ -11,6 +11,8 @@
 
   resin = require('resin-sdk');
 
+  settings = require('resin-settings-client');
+
   visuals = require('resin-cli-visuals');
 
   exports.whoami = {
@@ -29,7 +31,7 @@
     }
   };
 
-  TOKEN_URL = url.resolve(resin.settings.get('remoteUrl'), resin.settings.get('urls.preferences'));
+  TOKEN_URL = url.resolve(settings.get('remoteUrl'), '/preferences');
 
   exports.login = {
     signature: 'login [token]',
diff --git a/lib/actions/auth.coffee b/lib/actions/auth.coffee
index 36a7a0c5..950ca0ea 100644
--- a/lib/actions/auth.coffee
+++ b/lib/actions/auth.coffee
@@ -3,6 +3,7 @@ _ = require('lodash-contrib')
 url = require('url')
 async = require('async')
 resin = require('resin-sdk')
+settings = require('resin-settings-client')
 visuals = require('resin-cli-visuals')
 
 exports.whoami =
@@ -22,7 +23,7 @@ exports.whoami =
 			console.log(username)
 			return done()
 
-TOKEN_URL = url.resolve(resin.settings.get('remoteUrl'), resin.settings.get('urls.preferences'))
+TOKEN_URL = url.resolve(settings.get('remoteUrl'), '/preferences')
 
 exports.login	=
 	signature: 'login [token]'