diff --git a/frontend/app/settings/basic/basic.settings.component.html b/frontend/app/settings/basic/basic.settings.component.html
index 25b2529b..ad1402a8 100644
--- a/frontend/app/settings/basic/basic.settings.component.html
+++ b/frontend/app/settings/basic/basic.settings.component.html
@@ -47,6 +47,7 @@
           <input type="url" class="form-control" placeholder="{{urlPlaceholder}}"
                  id="publicUrl"
                  [(ngModel)]="settings.publicUrl"
+                 (change)="onUrlChanged()"
                  name="publicUrl">
           <small class="form-text text-muted" i18n>If you access the page form local network its good to know the public
             url for creating sharing link
@@ -60,6 +61,7 @@
           <input type="url" class="form-control" placeholder="/myGallery"
                  id="urlBase"
                  [(ngModel)]="settings.urlBase"
+                 (change)="onUrlBaseChanged()"
                  name="urlBase">
           <small class="form-text text-muted" i18n>If you access the gallery under a sub url (like:
             http://mydomain.com/myGallery), set it here. If not working you might miss the '/' from the beginning of the
@@ -68,6 +70,10 @@
         </div>
       </div>
 
+      <div *ngIf="urlError===true" class="alert alert-warning" role="alert" i18n>
+        The public url and the url base are not matching. Some of the functionality might not work.
+      </div>
+
       <button class="btn btn-success float-right"
               [disabled]="!settingsForm.form.valid || !changed || inProgress"
               (click)="save()" i18n>Save
diff --git a/frontend/app/settings/basic/basic.settings.component.ts b/frontend/app/settings/basic/basic.settings.component.ts
index 17e6a8cb..215100e4 100644
--- a/frontend/app/settings/basic/basic.settings.component.ts
+++ b/frontend/app/settings/basic/basic.settings.component.ts
@@ -17,6 +17,8 @@ import {I18n} from '@ngx-translate/i18n-polyfill';
 export class BasicSettingsComponent extends SettingsComponent<BasicConfigDTO> {
 
   urlPlaceholder = location.origin;
+  urlBaseChanged = false;
+  urlError = false;
 
   constructor(_authService: AuthenticationService,
               _navigation: NavigationService,
@@ -30,6 +32,7 @@ export class BasicSettingsComponent extends SettingsComponent<BasicConfigDTO> {
       publicUrl: s.Client.publicUrl,
       urlBase: s.Client.urlBase
     }));
+    this.checkUrlError();
   }
 
   public async save(): Promise<boolean> {
@@ -40,6 +43,42 @@ export class BasicSettingsComponent extends SettingsComponent<BasicConfigDTO> {
     return val;
   }
 
+  calcBaseUrl(): string {
+    console.log(this.settings.publicUrl.replace(new RegExp('\\\\', 'g'), '/'));
+    console.log(this.settings.publicUrl.replace(new RegExp('\\\\', 'g'), '/')
+      .replace(new RegExp('http://', 'g'), ''));
+    console.log(this.settings.publicUrl.replace(new RegExp('\\\\', 'g'), '/')
+      .replace(new RegExp('http://', 'g'), '')
+      .replace(new RegExp('https://', 'g'), ''));
+    const url = this.settings.publicUrl.replace(new RegExp('\\\\', 'g'), '/')
+      .replace(new RegExp('http://', 'g'), '')
+      .replace(new RegExp('https://', 'g'), '');
+    if (url.indexOf('/') !== -1) {
+      return url.substring(url.indexOf('/'));
+    }
+    return '';
+
+  }
+
+  checkUrlError() {
+    this.urlError = this.settings.urlBase !== this.calcBaseUrl();
+  }
+
+  onUrlChanged() {
+    if (this.urlBaseChanged === false) {
+      this.settings.urlBase = this.calcBaseUrl();
+    } else {
+      this.checkUrlError();
+    }
+
+  }
+
+  onUrlBaseChanged() {
+    this.urlBaseChanged = true;
+
+    this.checkUrlError();
+  }
+
 }
 
 
diff --git a/frontend/translate/messages.en.xlf b/frontend/translate/messages.en.xlf
index 3daaf69e..b9b158bc 100644
--- a/frontend/translate/messages.en.xlf
+++ b/frontend/translate/messages.en.xlf
@@ -18,9 +18,7 @@
           <context context-type="sourcefile">app/login/login.component.ts</context>
           <context context-type="linenumber">12</context>
         </context-group>
-        <target>
-          Wrong username or password
-        </target>
+        <target>Wrong username or password</target>
       </trans-unit>
       <trans-unit id="08c74dc9762957593b91f6eb5d65efdfc975bf48" datatype="html">
         <source>Username</source>
@@ -81,8 +79,7 @@
           <context context-type="sourcefile">app/login/login.component.ts</context>
           <context context-type="linenumber">66</context>
         </context-group>
-        <target>Login
-            </target>
+        <target>Login</target>
       </trans-unit>
       <trans-unit id="64034510da88fc99130864f733500fcd62aedb01" datatype="html">
         <source>
@@ -92,9 +89,7 @@
           <context context-type="sourcefile">app/sharelogin/share-login.component.ts</context>
           <context context-type="linenumber">11</context>
         </context-group>
-        <target>
-          Wrong password
-        </target>
+        <target>Wrong password</target>
       </trans-unit>
       <trans-unit id="7bc15e0478a1384ea38903e2506f4ae3fe7dd6e1" datatype="html">
         <source>Enter
@@ -103,8 +98,7 @@
           <context context-type="sourcefile">app/sharelogin/share-login.component.ts</context>
           <context context-type="linenumber">41</context>
         </context-group>
-        <target>Enter
-            </target>
+        <target>Enter</target>
       </trans-unit>
       <trans-unit id="e576d10a00b926dc56802231438eea7831b602ee" datatype="html">
         <source>download</source>
@@ -190,9 +184,7 @@
           <context context-type="sourcefile">app/gallery/gallery.component.ts</context>
           <context context-type="linenumber">39</context>
         </context-group>
-        <target>
-      Too many results to show. Refine your search.
-    </target>
+        <target>Too many results to show. Refine your search.</target>
       </trans-unit>
       <trans-unit id="24f166827601febff9ec90329582bc637781def8" datatype="html">
         <source>Searching for:</source>
@@ -229,8 +221,7 @@
           <context context-type="sourcefile">app/gallery/share/share.gallery.component.ts</context>
           <context context-type="linenumber">35</context>
         </context-group>
-        <target>Copy
-            </target>
+        <target>Copy</target>
       </trans-unit>
       <trans-unit id="07867d2c08ad81d9f1cb27f083c5d32d0d1f3bd6" datatype="html">
         <source>Sharing:</source>
@@ -306,9 +297,7 @@
           <context context-type="sourcefile">app/admin/admin.component.ts</context>
           <context context-type="linenumber">19</context>
         </context-group>
-        <target>
-        To dismiss these notifications, restart the server.
-      </target>
+        <target>To dismiss these notifications, restart the server.</target>
       </trans-unit>
       <trans-unit id="37e10df2d9c0c25ef04ac112c9c9a7723e8efae0" datatype="html">
         <source>Mode</source>
@@ -357,8 +346,7 @@
           <context context-type="sourcefile">app/settings/usermanager/usermanager.settings.component.ts</context>
           <context context-type="linenumber">55</context>
         </context-group>
-        <target>+ Add user
-      </target>
+        <target>+ Add user</target>
       </trans-unit>
       <trans-unit id="eebaef174029db4c77c4f7d1c68070774730f4d3" datatype="html">
         <source>
@@ -368,9 +356,7 @@
           <context context-type="sourcefile">app/settings/usermanager/usermanager.settings.component.ts</context>
           <context context-type="linenumber">58</context>
         </context-group>
-        <target>
-      To protect the site with password / have login enable this.
-    </target>
+        <target>To protect the site with password / have login enable this.</target>
       </trans-unit>
       <trans-unit id="2df47a22f05b9ac3bdabb6693d4bc37c3ad7c000" datatype="html">
         <source>Add new User</source>
@@ -395,8 +381,7 @@
           <context context-type="sourcefile">app/settings/usermanager/usermanager.settings.component.ts</context>
           <context context-type="linenumber">90</context>
         </context-group>
-        <target>Add User
-          </target>
+        <target>Add User</target>
       </trans-unit>
       <trans-unit id="26029ad47ff6a694b272298b212b5458128810be" datatype="html">
         <source>
@@ -464,8 +449,7 @@
           <context context-type="sourcefile">app/settings/database/database.settings.component.ts</context>
           <context context-type="linenumber">37</context>
         </context-group>
-        <target>Save
-    </target>
+        <target>Save</target>
       </trans-unit>
       <trans-unit id="606e35514c0bf86c3b47babbc76eb1bb4e973cb0" datatype="html">
         <source>Reset
@@ -474,8 +458,7 @@
           <context context-type="sourcefile">app/settings/database/database.settings.component.ts</context>
           <context context-type="linenumber">40</context>
         </context-group>
-        <target>Reset
-    </target>
+        <target>Reset</target>
       </trans-unit>
       <trans-unit id="808812b8319c389ecbb84c658d5b3eac7087d079" datatype="html">
         <source>Map settings</source>
@@ -539,14 +522,13 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/settings/basic/basic.settings.component.ts</context>
-          <context context-type="linenumber">73</context>
+          <context context-type="linenumber">79</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/settings/other/other.settings.component.ts</context>
           <context context-type="linenumber">97</context>
         </context-group>
-        <target>Save
-      </target>
+        <target>Save</target>
       </trans-unit>
       <trans-unit id="bdff31ca405839a31596fdb5bfd8ac933289b5e7" datatype="html">
         <source>Reset
@@ -569,14 +551,13 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/settings/basic/basic.settings.component.ts</context>
-          <context context-type="linenumber">76</context>
+          <context context-type="linenumber">82</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/settings/other/other.settings.component.ts</context>
           <context context-type="linenumber">100</context>
         </context-group>
-        <target>Reset
-      </target>
+        <target>Reset</target>
       </trans-unit>
       <trans-unit id="bd5ac05be2794f26efba6549c3368373da95173d" datatype="html">
         <source>
@@ -597,8 +578,7 @@
           <context context-type="linenumber">10</context>
         </context-group>
         <target>It is highly recommended to use hardware accelerated (sharp or gm) lib for thumbnail
-        generation
-      </target>
+        generation</target>
       </trans-unit>
       <trans-unit id="6f49ee2673fb82fe8dd1a7da0bada14a4156bf30" datatype="html">
         <source>Thumbnail generation library</source>
@@ -762,9 +742,7 @@
           <context context-type="sourcefile">app/settings/search/search.settings.component.ts</context>
           <context context-type="linenumber">68</context>
         </context-group>
-        <target>
-        Search is not supported with these settings
-      </target>
+        <target>Search is not supported with these settings</target>
       </trans-unit>
       <trans-unit id="2ca3f59b3fe47e837455e9090470356d27d1f59e" datatype="html">
         <source>Share settings</source>
@@ -798,9 +776,7 @@
           <context context-type="sourcefile">app/settings/share/share.settings.component.ts</context>
           <context context-type="linenumber">47</context>
         </context-group>
-        <target>
-        Sharing is not supported with these settings
-      </target>
+        <target>Sharing is not supported with these settings</target>
       </trans-unit>
       <trans-unit id="d62666b3159a0b5916b8f908c84e6b6f441ec1d1" datatype="html">
         <source>
@@ -850,7 +826,7 @@
           </source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/settings/basic/basic.settings.component.ts</context>
-          <context context-type="linenumber">51</context>
+          <context context-type="linenumber">52</context>
         </context-group>
         <target>If you access the page form local network its good to know the public
             url for creating sharing link</target>
@@ -859,7 +835,7 @@
         <source>Url Base</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/settings/basic/basic.settings.component.ts</context>
-          <context context-type="linenumber">58</context>
+          <context context-type="linenumber">59</context>
         </context-group>
         <target>Url Base</target>
       </trans-unit>
@@ -870,12 +846,22 @@
           </source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/settings/basic/basic.settings.component.ts</context>
-          <context context-type="linenumber">64</context>
+          <context context-type="linenumber">66</context>
         </context-group>
         <target>If you access the gallery under a sub url (like:
             http://mydomain.com/myGallery), set it here. If not working you might miss the '/' from the beginning of the
             url.</target>
       </trans-unit>
+      <trans-unit id="f268a48c3f70d641ccb99786fe49f21a769eb2bb" datatype="html">
+        <source>
+        The public url and the url base are not matching. Some of the functionality might not work.
+      </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/settings/basic/basic.settings.component.ts</context>
+          <context context-type="linenumber">73</context>
+        </context-group>
+        <target>The public url and the url base are not matching. Some of the functionality might not work.</target>
+      </trans-unit>
       <trans-unit id="ee1319d3bfb2e70e14212ea2c3896e4ac4dc0092" datatype="html">
         <source>
       Other settings
@@ -1037,8 +1023,7 @@
           <context context-type="sourcefile">app/settings/indexing/indexing.settings.component.ts</context>
           <context context-type="linenumber">55</context>
         </context-group>
-        <target>Save
-        </target>
+        <target>Save</target>
       </trans-unit>
       <trans-unit id="ae9e824f2eaba4400a5cb66ad946c433dc45b3d5" datatype="html">
         <source>Reset
@@ -1047,8 +1032,7 @@
           <context context-type="sourcefile">app/settings/indexing/indexing.settings.component.ts</context>
           <context context-type="linenumber">58</context>
         </context-group>
-        <target>Reset
-        </target>
+        <target>Reset</target>
       </trans-unit>
       <trans-unit id="b0eaa3abce5af3b71c03fe678062333b7b950430" datatype="html">
         <source>If you add a new folder to your gallery, the site indexes it automatically.</source>
@@ -1081,8 +1065,7 @@
           <context context-type="sourcefile">app/settings/indexing/indexing.settings.component.ts</context>
           <context context-type="linenumber">91</context>
         </context-group>
-        <target>Index
-        </target>
+        <target>Index</target>
       </trans-unit>
       <trans-unit id="e7e43ec575247424aa179da55b338fd740e8aa7f" datatype="html">
         <source>Cancel
@@ -1091,8 +1074,7 @@
           <context context-type="sourcefile">app/settings/indexing/indexing.settings.component.ts</context>
           <context context-type="linenumber">96</context>
         </context-group>
-        <target>Cancel
-        </target>
+        <target>Cancel</target>
       </trans-unit>
       <trans-unit id="d68e02eaea0b78b12fceb483b2183a3f5b70d969" datatype="html">
         <source>Reset Indexes
@@ -1101,8 +1083,7 @@
           <context context-type="sourcefile">app/settings/indexing/indexing.settings.component.ts</context>
           <context context-type="linenumber">100</context>
         </context-group>
-        <target>Reset Indexes
-        </target>
+        <target>Reset Indexes</target>
       </trans-unit>
       <trans-unit id="bc2e854e111ecf2bd7db170da5e3c2ed08181d88" datatype="html">
         <source>Advanced</source>
@@ -1148,6 +1129,18 @@
         </context-group>
         <target>No</target>
       </trans-unit>
+      <trans-unit id="381b3a21fe4e53a0ca52dbc6e07073c172489230" datatype="html">
+        <source>loading..</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">frontend/app/gallery/share/share.gallery.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">frontend/app/gallery/share/share.gallery.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <target>loading..</target>
+      </trans-unit>
       <trans-unit id="867c1b6839b592cec2156dd0b8a0009fe1557bfa" datatype="html">
         <source>Url has been copied to clipboard</source>
         <context-group purpose="location">
diff --git a/frontend/translate/messages.hu.xlf b/frontend/translate/messages.hu.xlf
index b03f5fed..0878692b 100644
--- a/frontend/translate/messages.hu.xlf
+++ b/frontend/translate/messages.hu.xlf
@@ -98,7 +98,7 @@
           <context context-type="sourcefile">app/sharelogin/share-login.component.ts</context>
           <context context-type="linenumber">41</context>
         </context-group>
-        <target>Belépés</target>
+        <target>Belép</target>
       </trans-unit>
       <trans-unit id="e576d10a00b926dc56802231438eea7831b602ee" datatype="html">
         <source>download</source>
@@ -408,7 +408,7 @@
           <context context-type="sourcefile">app/settings/database/database.settings.component.ts</context>
           <context context-type="linenumber">14</context>
         </context-group>
-        <target>Manuálisan kell telepíteni a mysql node-modulot a mysql (npm install mysql) használatához</target>
+        <target>Telepítsd kézzel mysql csomópont-modulot a mysql (npm install mysql) használatához</target>
       </trans-unit>
       <trans-unit id="1531e77d9dbcfb6a3efeb71fca40da5f5f7ddaaf" datatype="html">
         <source>MySQL settings:</source>
@@ -499,7 +499,7 @@
           <context context-type="sourcefile">app/settings/map/map.settings.component.ts</context>
           <context context-type="linenumber">35</context>
         </context-group>
-        <target>van szükség</target>
+        <target>szükség van</target>
       </trans-unit>
       <trans-unit id="d682be8fc94c1861394919e021e9dcf8def8f554" datatype="html">
         <source>Save
@@ -522,7 +522,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/settings/basic/basic.settings.component.ts</context>
-          <context context-type="linenumber">73</context>
+          <context context-type="linenumber">79</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/settings/other/other.settings.component.ts</context>
@@ -551,7 +551,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/settings/basic/basic.settings.component.ts</context>
-          <context context-type="linenumber">76</context>
+          <context context-type="linenumber">82</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/settings/other/other.settings.component.ts</context>
@@ -567,7 +567,7 @@
           <context context-type="sourcefile">app/settings/thumbnail/thumbanil.settings.component.ts</context>
           <context context-type="linenumber">3</context>
         </context-group>
-        <target>Thumbnail beállítások</target>
+        <target>Miniatűr beállítások</target>
       </trans-unit>
       <trans-unit id="1b239b0422945f36c35b5559b4b0c135922fe299" datatype="html">
         <source>It is highly recommended to use hardware accelerated (sharp or gm) lib for thumbnail
@@ -595,7 +595,7 @@
           <context context-type="sourcefile">app/settings/thumbnail/thumbanil.settings.component.ts</context>
           <context context-type="linenumber">24</context>
         </context-group>
-        <target>Győződj meg arról, hogy a sharp node modul telepítve van (npm telepítés éles).</target>
+        <target>Győződjön meg arról, hogy az éles csomópont modul telepítve van (npm telepítés éles).</target>
       </trans-unit>
       <trans-unit id="becf05481d292e5e206fda4b7d67d8fac4e85c93" datatype="html">
         <source>Make sure that gm node module and</source>
@@ -636,7 +636,7 @@
           <context context-type="sourcefile">app/settings/thumbnail/thumbanil.settings.component.ts</context>
           <context context-type="linenumber">44</context>
         </context-group>
-        <target>A thumnail-ek ebben a mappában lesznek elmentve. Gyózödj meg arról, hogy a mappához van írási joga az oldalnak</target>
+        <target>A miniatűrök ebben a mappában lesznek elmentve. Íráshoz való hozzáférés szükséges</target>
       </trans-unit>
       <trans-unit id="76a16cf361d95615469c06e26644b6e52f3a4411" datatype="html">
         <source>Thumbnail Quality</source>
@@ -826,7 +826,7 @@
           </source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/settings/basic/basic.settings.component.ts</context>
-          <context context-type="linenumber">51</context>
+          <context context-type="linenumber">52</context>
         </context-group>
         <target>Ha belépsz az oldal formája helyi hálózat jó tudni a nyilvánosságot
             URL megosztási link létrehozásához</target>
@@ -835,7 +835,7 @@
         <source>Url Base</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/settings/basic/basic.settings.component.ts</context>
-          <context context-type="linenumber">58</context>
+          <context context-type="linenumber">59</context>
         </context-group>
         <target>Al cím</target>
       </trans-unit>
@@ -846,12 +846,22 @@
           </source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/settings/basic/basic.settings.component.ts</context>
-          <context context-type="linenumber">64</context>
+          <context context-type="linenumber">66</context>
         </context-group>
         <target>Ha a galériát egy al-url alatt érheti el (például:
             http://mydomain.com/myGallery), állítsa be itt. Ha nem működik, akkor hiányolhat a "/" a kezdetétől
             url.</target>
       </trans-unit>
+      <trans-unit id="f268a48c3f70d641ccb99786fe49f21a769eb2bb" datatype="html">
+        <source>
+        The public url and the url base are not matching. Some of the functionality might not work.
+      </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/settings/basic/basic.settings.component.ts</context>
+          <context context-type="linenumber">73</context>
+        </context-group>
+        <target>A nyilvános url és az al url nem egyeznek meg. Néhány funkció lehet hogy nem fog működni.</target>
+      </trans-unit>
       <trans-unit id="ee1319d3bfb2e70e14212ea2c3896e4ac4dc0092" datatype="html">
         <source>
       Other settings
@@ -896,8 +906,8 @@
           <context context-type="sourcefile">app/settings/other/other.settings.component.ts</context>
           <context context-type="linenumber">32</context>
         </context-group>
-        <target>Görgetés alapú kirajzolás
-        </target>
+        <target>Görgetés alapú miniatűr
+          generáció</target>
       </trans-unit>
       <trans-unit id="b11dea996a20defa548ba5337c9745e43ac48440" datatype="html">
         <source>Those thumbnails get higher priority that are visible on the screen
@@ -970,8 +980,8 @@
           <context context-type="sourcefile">app/settings/indexing/indexing.settings.component.ts</context>
           <context context-type="linenumber">19</context>
         </context-group>
-        <target>Ha ebben az időben nem volt indexelés, akkor újraindex. (kihaggya, ha már létezik az index
-              és az érzékenység alacsony)</target>
+        <target>Ha ebben az időben nem volt indexelés, újraindexet hajt végre. (ha kihagyott
+              a DB index és az érzékenység alacsony)</target>
       </trans-unit>
       <trans-unit id="95cda683cfb2041ad808023f29e40d16981b3c5e" datatype="html">
         <source>Sub folder preview size</source>
@@ -1064,7 +1074,7 @@
           <context context-type="sourcefile">app/settings/indexing/indexing.settings.component.ts</context>
           <context context-type="linenumber">96</context>
         </context-group>
-        <target>Mégse</target>
+        <target>Megszünteti</target>
       </trans-unit>
       <trans-unit id="d68e02eaea0b78b12fceb483b2183a3f5b70d969" datatype="html">
         <source>Reset Indexes
@@ -1119,6 +1129,18 @@
         </context-group>
         <target>Nem</target>
       </trans-unit>
+      <trans-unit id="381b3a21fe4e53a0ca52dbc6e07073c172489230" datatype="html">
+        <source>loading..</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">frontend/app/gallery/share/share.gallery.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">frontend/app/gallery/share/share.gallery.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <target>betöltés..</target>
+      </trans-unit>
       <trans-unit id="867c1b6839b592cec2156dd0b8a0009fe1557bfa" datatype="html">
         <source>Url has been copied to clipboard</source>
         <context-group purpose="location">