diff --git a/dmp-frontend/src/app/form/dynamic-form.component.html b/dmp-frontend/src/app/form/dynamic-form.component.html
index b570589aa..f9d128b70 100644
--- a/dmp-frontend/src/app/form/dynamic-form.component.html
+++ b/dmp-frontend/src/app/form/dynamic-form.component.html
@@ -76,6 +76,6 @@
 					</div>
 				  </div>
 			<!-- <button type="button" class="btn btn-info" onclick="signOut();">Sign out</button> -->
-			<a href="#" onclick="signOut();">Sign out</a>
+			<a href="#" (click)="signOut2();">Sign out</a>
 	</div>
 	
diff --git a/dmp-frontend/src/app/form/dynamic-form.component.ts b/dmp-frontend/src/app/form/dynamic-form.component.ts
index 25fd5e7be..950b80032 100644
--- a/dmp-frontend/src/app/form/dynamic-form.component.ts
+++ b/dmp-frontend/src/app/form/dynamic-form.component.ts
@@ -11,6 +11,7 @@ import { dataModelBuilder } from '../../app/services/dataModelBuilder.service';
 import { DataModel } from '../entities/DataModel';
 import { GroupBase } from './dynamic-form-group/group-base';
 import { PaginationService } from '../../app/services/pagination.service';
+import { TokenService, TokenProvider } from '../services/token.service';
 
 import './../../assets/xml2json.min.js';
 declare var X2JS: any;
@@ -33,7 +34,7 @@ export class DynamicFormComponent implements OnInit {
   xml2jsonOBJ: any;
 
   constructor(private qcs: FieldControlService, private serverService: ServerService, private dataModelService: dataModelBuilder, private router: Router,
-    private route: ActivatedRoute, private pagerService: PaginationService) {
+    private route: ActivatedRoute, private pagerService: PaginationService, private tokenService : TokenService) {
     this.form = this.qcs.toFormGroup(new Array(), new Array());
     this.xml2jsonOBJ = new X2JS();
   }
@@ -159,9 +160,9 @@ signOut2() {debugger;
       var auth2 = gapi.auth2.getAuthInstance();
       auth2.signOut().then(function () {
         console.log('User signed out.');
-        localStorage.removeItem('currentUser');
-        this.tokenService.setToken('token',null);
+        localStorage.removeItem('currentUser');              
       });
+     this.tokenService.setToken(null); //kanonika prepei na mpei mesa sthn function.....
     }
 
   onValueChanged(data?: any) {