diff --git a/connect/connectHelper.ts b/connect/connectHelper.ts
index dfa1f5f2..69acee33 100644
--- a/connect/connectHelper.ts
+++ b/connect/connectHelper.ts
@@ -2,7 +2,7 @@ export class ConnectHelper{
 
   public static  getCommunityFromDomain(domain:string):string{
     // domain = "beta.egi.openaire.eu"; for testing
-    if(domain.indexOf("di.uoa.gr")!=-1){
+    if(domain.indexOf("openaire.eu") == -1){
       return null;
     }
     if(domain.indexOf("beta")!=-1){
@@ -17,11 +17,10 @@ export class ConnectHelper{
     return domain;
   }
   public static  isProduction(domain:string):boolean{
-    if(domain.indexOf(".di.uoa.gr")!=-1){
+    if(domain.indexOf(".openaire.eu")==-1){
       return false;
-    }else if(domain.indexOf(".openaire.eu")!=-1){
-      return true;
     }
+    return true;
   }
   public static  getProductionPrefix(domain:string):string{
     if(domain.indexOf("beta.")!=-1){