diff --git a/ghost/admin/app/controllers/setup/two.js b/ghost/admin/app/controllers/setup/two.js
index c7068332a6..89c023dfa2 100644
--- a/ghost/admin/app/controllers/setup/two.js
+++ b/ghost/admin/app/controllers/setup/two.js
@@ -98,8 +98,8 @@ export default Controller.extend(ValidationEngine, {
 
         return new Promise((resolve, reject) => {
             image.formData = {};
-            image.submit()
-                .success((response) => {
+            return image.submit()
+                .done((response) => {
                     let usersUrl = this.get('ghostPaths.url').api('users', user.id.toString());
                     user.image = response;
 
@@ -109,7 +109,7 @@ export default Controller.extend(ValidationEngine, {
                         }
                     }).then(resolve).catch(reject);
                 })
-                .error(reject);
+                .fail(reject);
         });
     },
 
diff --git a/ghost/admin/app/controllers/signup.js b/ghost/admin/app/controllers/signup.js
index 189f194025..e5d4a53b9d 100644
--- a/ghost/admin/app/controllers/signup.js
+++ b/ghost/admin/app/controllers/signup.js
@@ -156,17 +156,17 @@ export default Controller.extend(ValidationEngine, {
             return this.get('session.user').then((user) => {
                 return new Promise((resolve, reject) => {
                     image.formData = {};
-                    image.submit()
-                        .success((response) => {
+                    return image.submit()
+                        .done((response) => {
                             let usersUrl = this.get('ghostPaths.url').api('users', user.id.toString());
                             user.image = response;
-                            this.get('ajax').put(usersUrl, {
+                            return this.get('ajax').put(usersUrl, {
                                 data: {
                                     users: [user]
                                 }
                             }).then(resolve).catch(reject);
                         })
-                        .error(reject);
+                        .fail(reject);
                 });
             });
         }