diff --git a/app/src/views/Setup/Weather.vue b/app/src/views/Setup/Weather.vue
index f4cd049..93abfb9 100644
--- a/app/src/views/Setup/Weather.vue
+++ b/app/src/views/Setup/Weather.vue
@@ -113,10 +113,10 @@
         this.$router.push('/setup/name')
       },
       registerApiKey () {
-        window.open('http://openweathermap.org/')
+        window.open('https://openweathermap.org/')
       },
       stepBack () {
-        this.$router.push('/setup/')
+        this.$router.push('/setup/wifi')
       },
     },
   }
diff --git a/app/src/views/Setup/Wifi.vue b/app/src/views/Setup/Wifi.vue
index 2c3cb8b..b400aef 100644
--- a/app/src/views/Setup/Wifi.vue
+++ b/app/src/views/Setup/Wifi.vue
@@ -121,7 +121,9 @@
     },
     methods: {
       onWifiSelect (wifi) {
-        if (wifi.secure) {
+        if (wifi.ssid === this.settings.system.wifi) {
+          this.nextStep()
+        } else if (wifi.secure) {
           this.connectSSID = wifi.ssid
           this.wifiPasswordModal = true
         } else {
@@ -143,6 +145,9 @@
       stepBack () {
         this.$router.push('/setup/country')
       },
+      nextStep () {
+        this.$router.push('/setup/weather')
+      },
     },
   }
 </script>