diff --git a/app/app/services/document.js b/app/app/services/document.js
index 1199e593..beb89c8c 100644
--- a/app/app/services/document.js
+++ b/app/app/services/document.js
@@ -124,8 +124,8 @@ export default Ember.Service.extend({
     },
 
     updatePage: function(documentId, pageId, payload, skipRevision) {
-        let url = this.get('sessionService').appMeta.getUrl("documents/" + documentId + "/pages/" + pageId + revision);
         var revision = skipRevision ? "?r=true" : "?r=false";
+        let url = this.get('sessionService').appMeta.getUrl("documents/" + documentId + "/pages/" + pageId + revision);
 
         return this.get('ajax').request(url, {
             method: 'PUT',
diff --git a/app/app/services/session.js b/app/app/services/session.js
index 851311bc..1de1fa04 100644
--- a/app/app/services/session.js
+++ b/app/app/services/session.js
@@ -92,7 +92,7 @@ export default Ember.Service.extend({
         }).then((response)=>{
             this.setSession(response.token, models.UserModel.create(response.user));
             this.get('ready', true);
-            resolve(response);
+            return response;
         });
     },
 
@@ -192,7 +192,7 @@ export default Ember.Service.extend({
                 return this.get('ajax').request(tokenCheckUrl, {
                     method: 'GET',
                     contentType: 'json'
-                }).then((response) => {
+                }).then((user) => {
                     this.setSession(token, models.UserModel.create(user));
                     this.set('ready', true);
                 }).catch((reason) => {