diff --git a/app/controllers/signup/account.js b/app/controllers/signup/account.js
index f22097d..3c333a9 100644
--- a/app/controllers/signup/account.js
+++ b/app/controllers/signup/account.js
@@ -1,18 +1,15 @@
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
-import { alias } from '@ember/object/computed';
 import { tracked } from '@glimmer/tracking';
 import config from 'kredits-web/config/environment';
 import { isAddress } from 'web3-utils';
 
-export default class BudgetController extends Controller {
+export default class AccountController extends Controller {
   @service kredits;
 
   @tracked accountAddress = null;
 
-  @alias('kredits.githubAccessToken') githubAccessToken;
-
   get isValidEthAccount () {
     return isAddress(this.accountAddress);
   }
@@ -24,7 +21,7 @@ export default class BudgetController extends Controller {
   @action
   completeSignup () {
     const payload = {
-      accessToken: this.githubAccessToken,
+      accessToken: this.kredits.githubAccessToken,
       account: this.accountAddress
     }
 
@@ -43,7 +40,7 @@ export default class BudgetController extends Controller {
       } else {
         console.log('[signup/account] Created contributor:', data);
 
-        this.githubAccessToken = null;
+        this.kredits.githubAccessToken = null;
         this.accountAddress = null;
 
         this.transitionToRoute('signup.complete');
diff --git a/app/controllers/signup/index.js b/app/controllers/signup/index.js
index d90035c..e8204a4 100644
--- a/app/controllers/signup/index.js
+++ b/app/controllers/signup/index.js
@@ -1,14 +1,12 @@
 import Controller from '@ember/controller';
+import { action } from '@ember/object';
 import config from 'kredits-web/config/environment';
 
-export default Controller.extend({
-
-  actions: {
-
-    connectGithub () {
-      window.location = config.githubConnectUrl;
-    }
+export default class IndexController extends Controller {
 
+  @action
+  connectGithub () {
+    window.location = config.githubConnectUrl;
   }
 
-});
+}