diff --git a/src/services/apiService.js b/src/services/apiService.js
index b5375b48..0b19d331 100644
--- a/src/services/apiService.js
+++ b/src/services/apiService.js
@@ -1,6 +1,6 @@
 function ApiService(tokenService, logoutCallback) {
-    //this.baseUrl = 'http://localhost:4000';
-    this.baseUrl = 'https://api.bitwarden.com';
+    this.baseUrl = 'http://localhost:4000';
+    //this.baseUrl = 'https://api.bitwarden.com';
     this.tokenService = tokenService;
     this.logoutCallback = logoutCallback;
 
diff --git a/src/services/tokenService.js b/src/services/tokenService.js
index 331d21a0..eecca2db 100644
--- a/src/services/tokenService.js
+++ b/src/services/tokenService.js
@@ -221,13 +221,21 @@ function initTokenService() {
     TokenService.prototype.getEmail = function () {
         var decoded = this.decodeToken();
 
-        var email = decoded['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress'];
-
-        if (typeof email === 'undefined') {
+        if (typeof decoded.email === 'undefined') {
             throw 'No email found';
         }
 
-        return email;
+        return decoded.email;
+    };
+
+    TokenService.prototype.getName = function () {
+        var decoded = this.decodeToken();
+
+        if (typeof decoded.name === 'undefined') {
+            throw 'No name found';
+        }
+
+        return decoded.name;
     };
 
     function urlBase64Decode(str) {