diff --git a/app/app/components/document/page-wizard.js b/app/app/components/document/page-wizard.js
index 74bda081..b988bbfd 100644
--- a/app/app/components/document/page-wizard.js
+++ b/app/app/components/document/page-wizard.js
@@ -35,9 +35,9 @@ export default Ember.Component.extend(NotifierMixin, {
 
             this.set("sections", sections);
 
-			if (this.session.get('popupBlocked')) {
-				this.showNotification("Hmm, looks like your browser is blocking popups...");
-			}
+			// if (this.session.get('popupBlocked')) {
+			// 	this.showNotification("Hmm, looks like your browser is blocking popups...");
+			// }
         },
 
         onCancel() {
diff --git a/app/app/components/section/trello/type-editor.js b/app/app/components/section/trello/type-editor.js
index 9f8b0f37..aa30bc6c 100644
--- a/app/app/components/section/trello/type-editor.js
+++ b/app/app/components/section/trello/type-editor.js
@@ -55,6 +55,15 @@ export default Ember.Component.extend(SectionMixin, NotifierMixin, TooltipMixin,
 
         this.set('config', config);
 
+		// On auth callback capture user token
+		let hashToken = window.location.hash;
+		if (is.not.undefined(hashToken) && is.not.null(hashToken)) {
+			let token = hashToken.replace("#token=", "");
+			if (is.not.empty(token)) {
+				this.set('config.token', token);
+			}
+		}
+
         if (this.get('config.appKey') !== "" && this.get('config.token') !== "") {
             this.send('auth');
         }
@@ -148,8 +157,8 @@ export default Ember.Component.extend(SectionMixin, NotifierMixin, TooltipMixin,
 
             Ember.$.getScript("https://api.trello.com/1/client.js?key=" + this.get('config.appKey'), function() {
                 Trello.authorize({
-                    type: "popup",
-                    // interactive: false,
+                    type: "redirect",
+                    interactive: true,
                     name: "Documize",
                     scope: {
                         read: true,
diff --git a/app/app/services/session.js b/app/app/services/session.js
index f1ab0d48..de8cdf10 100644
--- a/app/app/services/session.js
+++ b/app/app/services/session.js
@@ -183,14 +183,14 @@ export default Ember.Service.extend({
             });
         }
 
-		var blockedPopupTest = window.open("http://d27wjpa4h6c9yx.cloudfront.net/", "directories=no,height=1,width=1,menubar=no,resizable=no,scrollbars=no,status=no,titlebar=no,top=0,location=no");
-
-		if (!blockedPopupTest) {
-			this.set('popupBlocked', true);
-		} else {
-			blockedPopupTest.close();
-			this.set('popupBlocked', false);
-		}
+		// var blockedPopupTest = window.open("http://maintenance.documize.com", "directories=no,height=1,width=1,menubar=no,resizable=no,scrollbars=no,status=no,titlebar=no,top=0,location=no");
+		//
+		// if (!blockedPopupTest) {
+		// 	this.set('popupBlocked', true);
+		// } else {
+		// 	blockedPopupTest.close();
+		// 	this.set('popupBlocked', false);
+		// }
 
         return new Ember.RSVP.Promise(function(resolve) {
             $.ajax({
diff --git a/documize/api/endpoint/router.go b/documize/api/endpoint/router.go
index 86f6e166..59b34d33 100644
--- a/documize/api/endpoint/router.go
+++ b/documize/api/endpoint/router.go
@@ -30,7 +30,7 @@ const (
 	// AppVersion does what it says
 	// Versioning scheme major.minor where "minor" is optional
 	// e.g. 1, 2, 3, 4.1, 4.2, 5, 6, 7, 7.1, 8, 9, 10, ..... 127, 127.1, 128
-	AppVersion = "12"
+	AppVersion = "12.1"
 )
 
 var port, certFile, keyFile, forcePort2SSL string