--- a/client/src/components/Maplayer.vue	Mon Feb 18 16:08:16 2019 +0100
+++ b/client/src/components/Maplayer.vue	Mon Feb 18 16:08:33 2019 +0100
@@ -53,6 +53,7 @@
   computed: {
     ...mapGetters("map", ["getLayerByName", "getVSourceByName"]),
     ...mapState("map", [
+      "initialLoad",
       "extent",
       "layers",
       "openLayersMap",
@@ -181,32 +182,35 @@
     });
     this.$store.dispatch("map/openLayersMap", map);
 
-    var currentUser = this.$store.state.user.user;
-    HTTP.get("/users/" + currentUser, {
-      headers: {
-        "X-Gemma-Auth": localStorage.getItem("token"),
-        "Content-type": "text/xml; charset=UTF-8"
-      }
-    })
-      .then(response => {
-        this.$store.commit("map/moveToBoundingBox", {
-          boundingBox: [
-            response.data.extent.x1,
-            response.data.extent.y1,
-            response.data.extent.x2,
-            response.data.extent.y2
-          ],
-          zoom: 17,
-          preventZoomOut: true
+    if (this.initialLoad) {
+      this.$store.commit("map/initialLoad", false);
+      var currentUser = this.$store.state.user.user;
+      HTTP.get("/users/" + currentUser, {
+        headers: {
+          "X-Gemma-Auth": localStorage.getItem("token"),
+          "Content-type": "text/xml; charset=UTF-8"
+        }
+      })
+        .then(response => {
+          this.$store.commit("map/moveToBoundingBox", {
+            boundingBox: [
+              response.data.extent.x1,
+              response.data.extent.y1,
+              response.data.extent.x2,
+              response.data.extent.y2
+            ],
+            zoom: 17,
+            preventZoomOut: true
+          });
+        })
+        .catch(error => {
+          const { status, data } = error.response;
+          displayError({
+            title: this.$gettext("Backend Error"),
+            message: `${status}: ${data.message || data}`
+          });
         });
-      })
-      .catch(error => {
-        const { status, data } = error.response;
-        displayError({
-          title: this.$gettext("Backend Error"),
-          message: `${status}: ${data.message || data}`
-        });
-      });
+    }
 
     // TODO make display of layers more dynamic, e.g. from a list
 

--- a/client/src/components/importschedule/Importscheduledetail.vue	Mon Feb 18 16:08:16 2019 +0100
+++ b/client/src/components/importschedule/Importscheduledetail.vue	Mon Feb 18 16:08:33 2019 +0100
@@ -742,7 +742,7 @@
       }
       if (this.isCredentialsRequired) {
         if (!this.username || !this.password) return;
-        data["username"] = this.username;
+        data["user"] = this.username;
         data["password"] = this.password;
       }
       if (this.import_ == this.$options.IMPORTTYPES.FAIRWAYDIMENSION) {
@@ -815,7 +815,7 @@
         if (!this.username || !this.password) return;
         config = {
           ...config,
-          username: this.username,
+          user: this.username,
           password: this.password
         };
       }

--- a/client/src/store/importschedule.js	Mon Feb 18 16:08:16 2019 +0100
+++ b/client/src/store/importschedule.js	Mon Feb 18 16:08:33 2019 +0100
@@ -37,7 +37,7 @@
   wx: "waterwayaxis",
   wa: "waterwayarea",
   fd: "fairwaydimension",
-  wg: "waterwaygauge",
+  wg: "waterwaygauges",
   dmv: "distancemarksvirtual",
   dma: "distancemarksashore"
 };
@@ -130,7 +130,7 @@
       if (url) {
         Vue.set(state.currentSchedule, "url", url);
       }
-      let { insecure, username, password, los, depth } = config;
+      let { insecure, user, password, los, depth } = config;
       let sortBy = config["sort-by"];
       let minWidth = config["min-width"];
       let maxWidth = config["max-width"];
@@ -146,8 +146,8 @@
       if (sortBy) {
         Vue.set(state.currentSchedule, "sortBy", sortBy);
       }
-      if (username) {
-        Vue.set(state.currentSchedule, "username", username);
+      if (user) {
+        Vue.set(state.currentSchedule, "username", user);
       }
       if (password) {
         Vue.set(state.currentSchedule, "password", password);

--- a/client/src/store/map.js	Mon Feb 18 16:08:16 2019 +0100
+++ b/client/src/store/map.js	Mon Feb 18 16:08:33 2019 +0100
@@ -63,6 +63,7 @@
 const init = () => {
   return {
     openLayersMap: null,
+    initialLoad: true,
     extent: {
       lat: 6155376,
       lon: 1819178,
@@ -484,6 +485,9 @@
     }
   },
   mutations: {
+    initialLoad: (state, initialLoad) => {
+      state.initialLoad = initialLoad;
+    },
     extent: (state, extent) => {
       state.extent = extent;
     },