diff --git a/packages/basic.gblib/services/GBVMService.ts b/packages/basic.gblib/services/GBVMService.ts
index 77b6e0ec..5cfcda1e 100644
--- a/packages/basic.gblib/services/GBVMService.ts
+++ b/packages/basic.gblib/services/GBVMService.ts
@@ -187,7 +187,7 @@ export class GBVMService extends GBService {
     tolist = this.getToLst;
     headers = {};
 
-    hear gbLogin as login
+    ${process.env.ENABLE_AUTH? `hear gbLogin as login`:``}
 
     ${code}
     `;
@@ -241,9 +241,6 @@ export class GBVMService extends GBService {
       return `${$1} = hear("menu", ${$2})`;
     });
 
-    code = code.replace(/(go to)(\s)(.*)/gi, ($0, $1, $2, $3) => {
-      return `gotoDialog(step, ${$3})\n`;
-    });
 
     code = code.replace(/(hear)\s*(\w+)/gi, ($0, $1, $2) => {
       return `${$2} = hear()`;
@@ -297,6 +294,10 @@ export class GBVMService extends GBService {
       }
     });
 
+    code = code.replace(/(go to)(\s)(.*)/gi, ($0, $1, $2, $3) => {
+      return `gotoDialog(step, ${$3})\n`;
+    });
+
     code = code.replace(/(set language)(\s*)(.*)/gi, ($0, $1, $2, $3) => {
       return `setLanguage (step, ${$3})\n`;
     });
@@ -531,6 +532,9 @@ export class GBVMService extends GBService {
     code = code.replace(/("[^"]*"|'[^']*')|\bdateDiff\b/gi, ($0, $1) => {
       return $1 === undefined ? 'this.dateDiff' : $1;
     });
+    code = code.replace(/("[^"]*"|'[^']*')|\bgotoDialog\b/gi, ($0, $1) => {
+      return $1 === undefined ? 'this.gotoDialog' : $1;
+    });
     code = code.replace(/("[^"]*"|'[^']*')|\bsetMaxLines\b/gi, ($0, $1) => {
       return $1 === undefined ? 'this.setMaxLines' : $1;
     });