diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/main.js
index d25bfad..27de5f3 100644
--- a/client/js/controllers/home/main.js
+++ b/client/js/controllers/home/main.js
@@ -6,7 +6,6 @@
 mainApp.controller('homeCtrl', [ '$scope', 'Compute', function ($scope, Compute)
 {
 
-
 	var updatePage=function(){
 		// TODO Update graph etc...
 	}
diff --git a/client/js/controllers/login.js b/client/js/controllers/login.js
index 829fc1d..a37591c 100644
--- a/client/js/controllers/login.js
+++ b/client/js/controllers/login.js
@@ -20,7 +20,6 @@ mainApp.controller('loginCtrl', ['$scope','$sce','Identity', function ($scope,$s
     $('#loadingLoginButton').hide();
     $('#failedToLoginAlert').hide();
 
-     
     $scope.loginAction=function(){
 		
 		// Begin login state for template
diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js
index c5c8da9..70359ee 100644
--- a/client/js/services/Compute.js
+++ b/client/js/services/Compute.js
@@ -31,8 +31,8 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){
 		
 	// Return services objects
 	return {
-		getMachines: getMachines
-		pullData: pullData
+		getMachines: getMachines,
+		pullData: pullData,
 		data:data
 	};
 
diff --git a/client/js/services/Identity.js b/client/js/services/Identity.js
index 8ee664c..0dfba47 100644
--- a/client/js/services/Identity.js
+++ b/client/js/services/Identity.js
@@ -7,14 +7,17 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
     var profile={};
     profile.username=null;
     profile.projectname=null;
-	profile.token=null;
-
+	var token={};
+	token.part_0=null;
+	token.part_1=null;
 
 	/**
 	 * Save profile in cookies 
 	 */
 	var saveCookieForSession=function(){
-		$cookies.putObject('profile', 5);
+		$cookies.putObject('profile', profile);
+		$cookies.putObject('token.part_0', token.part_0);
+		$cookies.putObject('token.part_1', token.part_1);
 	};
 
 
@@ -23,10 +26,17 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 	 */
 	var isAlreadyLogin=function(){
 		var profileInCookie=$cookies.getObject('profile');
-		console.log(profileInCookie);
+		var tokenPart_0InCookie=$cookies.getObject('token.part_0');
+		var tokenPart_1InCookie=$cookies.getObject('token.part_0');
+
 		
-		if(typeof profileInCookie !== 'undefined'){
+		if(typeof profileInCookie !== 'undefined'
+		   && typeof tokenPart_0InCookie !== 'undefined'
+		   && typeof tokenPart_1InCookie !== 'undefined'
+		  ){
 			angular.extend(profile, profileInCookie);
+			token.part_0=tokenPart_0InCookie;
+			token.part_1=tokenPart_1InCookie;
 			return true;
 		}
 
@@ -38,6 +48,8 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 	 */
 	var logout=function(){
 		$cookies.remove('profile');
+		$cookies.remove('token.part_0');
+		$cookies.remove('token.part_1');
 	}
 
 	
@@ -56,7 +68,11 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 
 		if (typeof response.data.token !== 'undefined') {
 			requestParserResult.status=0;
-			profile.token=response.data.token;
+
+			var middle=parseInt(response.data.token.length/2);
+			token.part_0=response.data.token.substring(0, middle);
+			token.part_1=response.data.token.substring(middle, response.data.token.length);
+			
 			saveCookieForSession();
 		}
 		else if(failedToSendRequest){
@@ -70,6 +86,9 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 	};
 
 
+	var getToken=function(){
+		return token.part_0+token.part_1;
+	}
 	
 	/**
 	 * Function to connect to OpenStack
@@ -104,7 +123,8 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 		login: login,
 		profile: profile,
 		isAlreadyLogin: isAlreadyLogin,
-		logout:logout
+		logout:logout,
+		getToken:getToken
 	};