diff --git a/server/repos.go b/server/repos.go
index 8133f156c..bd7d19994 100644
--- a/server/repos.go
+++ b/server/repos.go
@@ -210,12 +210,11 @@ func PostRepo(c *gin.Context) {
 
 	// activate the repository before we make any
 	// local changes to the database.
-	// err = remote.Activate(user, r, keypair, link)
-	// if err != nil {
-	// 	c.Fail(500, err)
-	// 	return
-	// }
-	println(link)
+	err = remote.Activate(user, r, keypair, link)
+	if err != nil {
+		c.Fail(500, err)
+		return
+	}
 
 	// persist the repository
 	err = store.SetRepoNotExists(user, r)
diff --git a/server/static/scripts/drone.js b/server/static/scripts/drone.js
index f849dd21b..9adf491dc 100644
--- a/server/static/scripts/drone.js
+++ b/server/static/scripts/drone.js
@@ -105,7 +105,7 @@
 		$httpProvider.interceptors.push(function($q, $location) {
 			return {
 				'responseError': function(rejection) {
-					if (rejection.status === 401) {// && rejection.config.url != "/api/user") {
+					if (rejection.status === 401 && rejection.config.url !== "/api/user") {
 						$location.path('/login');
 					}
 					if (rejection.status === 0) {
diff --git a/server/static/scripts/services/users.js b/server/static/scripts/services/users.js
index cc482592a..8ddb83289 100644
--- a/server/static/scripts/services/users.js
+++ b/server/static/scripts/services/users.js
@@ -74,6 +74,8 @@
 			this.getCurrent().then(function(payload){
 				_user=payload;
 				defer.resolve(_user);
+			}).catch(function(){
+				defer.resolve(_user);
 			});
 
 			return defer.promise;