diff --git a/connect-admin-beta-properties.json b/connect-admin-beta-properties.json
index bc2e78a..402cf6f 100644
--- a/connect-admin-beta-properties.json
+++ b/connect-admin-beta-properties.json
@@ -38,7 +38,8 @@
   "logoutOpenaireUrl" :"http://dl067.madgik.di.uoa.gr/idp/profile/Logout",
 
   "cookieDomain" :".openaire.eu",
-
+  
+  "feedbackQuestionaire" :"https://docs.google.com/forms/d/e/1FAIpQLSf7AJ-1MG98qeOKL4BUNBk47AAl5MPJC6CdRu19xIhwApN3NA/viewform",
   "feedbackmail" :"openaire.test@gmail.com",
   "feedbackmailForMissingEntities": "feedback@openaire.eu",
 
diff --git a/connect-admin-production-properties.json b/connect-admin-production-properties.json
index 1e6b37d..d0fbc67 100644
--- a/connect-admin-production-properties.json
+++ b/connect-admin-production-properties.json
@@ -39,6 +39,7 @@
 
   "cookieDomain" :".openaire.eu",
 
+  "feedbackQuestionaire" :"https://docs.google.com/forms/d/e/1FAIpQLSf7AJ-1MG98qeOKL4BUNBk47AAl5MPJC6CdRu19xIhwApN3NA/viewform",
   "feedbackmail" :"openaire.test@gmail.com",
   "feedbackmailForMissingEntities": "feedback@openaire.eu",
 
diff --git a/src/app/app.component.html b/src/app/app.component.html
index f2bb46c..39eec6e 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -203,6 +203,7 @@
   <!-- <div class="uk-width-expand"> -->
     <router-outlet></router-outlet>
   </div>
+  <feedback *ngIf= "properties" portalName="Admin" [feedbackQuestionaire]=properties.feedbackQuestionaire></feedback>
   </div>
 </div>
 <!--cookie-law *ngIf= "isClient" position="bottom">
@@ -212,4 +213,4 @@
     <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="chevron-right" ratio="1"><polyline fill="none" stroke="#000" stroke-width="1.03" points="7 4 13 10 7 16"></polyline></svg>
     </span></a>
 </cookie-law-->
- <bottom *ngIf= "isClient"></bottom>
+ <!-- <bottom *ngIf= "isClient"></bottom> -->
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index e209323..b6df702 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -19,7 +19,7 @@ declare var UIkit: any;
 
 export class AppComponent {
   title = 'Metadata Registry Service';
-  isClient:boolean = false;
+  //isClient:boolean = false;
 
 
    userMenuItems:MenuItem[] =  [];
diff --git a/src/assets/env-properties.json b/src/assets/env-properties.json
index 13b5265..5c301fd 100644
--- a/src/assets/env-properties.json
+++ b/src/assets/env-properties.json
@@ -39,6 +39,7 @@
 
   "cookieDomain" :".di.uoa.gr",
 
+  "feedbackQuestionaire" :"https://docs.google.com/forms/d/e/1FAIpQLSf7AJ-1MG98qeOKL4BUNBk47AAl5MPJC6CdRu19xIhwApN3NA/viewform",
   "feedbackmail" :"openaire.test@gmail.com",
   "feedbackmailForMissingEntities" :"feedback@openaire.eu",
 
@@ -46,7 +47,7 @@
 
   "cacheUrl" :"http://scoobydoo.di.uoa.gr:3000/get?url=",
 
-  "adminToolsAPIURL" :"http://scoobydoo.di.uoa.gr:8080/uoa-admin-tools/",
+  "adminToolsAPIURL" :"http://duffy.di.uoa.gr:8080/uoa-admin-tools/",
 
   "adminToolsCommunity" :"openaire",
   "communityAPI": "https://dev-openaire.d4science.org/openaire/community/",