diff --git a/src/QGC.h b/src/QGC.h
index 638622b11e8a10240f01be6b20a7752b09fc650c..6ddd5fc67fd9641221b4d26192496239550bd395 100644
--- a/src/QGC.h
+++ b/src/QGC.h
@@ -30,6 +30,22 @@
 
 #include "configuration.h"
 
+
+/* Windows fixes */
+#ifdef _MSC_VER
+#include <math.h>
+#define isnan(x) _isnan(x)
+#define isinf(x) (!_finite(x))
+#else
+#include <cmath>
+#ifndef isnan
+#define isnan(x) std::isnan(x)
+#endif
+#ifndef isinf
+#define isinf(x) std::isinf(x)
+#endif
+#endif
+
 namespace QGC
 {
 const static int defaultSystemId = 255;
diff --git a/src/uas/UASInterface.h b/src/uas/UASInterface.h
index d83e85f3401d51b5fb3d541b25f03aec8293a5ad..2c31401fe39bff57f0a409fddd2edada9ca611da 100644
--- a/src/uas/UASInterface.h
+++ b/src/uas/UASInterface.h
@@ -468,6 +468,10 @@ signals:
     /** @brief Core specifications have changed */
     void systemSpecsChanged(int uasId);
 
+
+    // HOME POSITION / ORIGIN CHANGES
+    void homePositionChanged(int uas, double lat, double lon, double alt);
+
 protected:
 
     // TIMEOUT CONSTANTS
diff --git a/src/uas/UASManager.cc b/src/uas/UASManager.cc
index 16094222ded3a0288ec36db8105c635e03535162..18ddc01121d5b3e8a035596080bad3d59139d3f4 100644
--- a/src/uas/UASManager.cc
+++ b/src/uas/UASManager.cc
@@ -67,32 +67,72 @@ void UASManager::loadSettings()
     QSettings settings;
     settings.sync();
     settings.beginGroup("QGC_UASMANAGER");
-    setHomePosition(settings.value("HOMELAT", homeLat).toDouble(),
+    bool changed =  setHomePosition(settings.value("HOMELAT", homeLat).toDouble(),
                     settings.value("HOMELON", homeLon).toDouble(),
                     settings.value("HOMEALT", homeAlt).toDouble());
+
+    // Make sure to fire the change - this will
+    // make sure widgets get the signal once
+    if (!changed)
+    {
+        emit homePositionChanged(homeLat, homeLon, homeAlt);
+    }
+
     settings.endGroup();
 }
 
 bool UASManager::setHomePosition(double lat, double lon, double alt)
 {
     // Checking for NaN and infitiny
-	// FIXME does not work with MSVC: && !std::isinf(lat) && !std::isinf(lon) && !std::isinf(alt)
-    if (lat == lat && lon == lon && alt == alt 
-        && lat <= 90.0 && lat >= -90.0 && lon <= 180.0 && lon >= -180.0) {
+    // and checking for borders
+    bool changed = false;
+    if (!isnan(lat) && !isnan(lon) && !isnan(alt)
+        && !isinf(lat) && !isinf(lon) && !isinf(alt)
+        && lat <= 90.0 && lat >= -90.0 && lon <= 180.0 && lon >= -180.0)
+        {
 
-        bool changed = false;
         if (homeLat != lat) changed = true;
         if (homeLon != lon) changed = true;
         if (homeAlt != alt) changed = true;
 
-        homeLat = lat;
-        homeLon = lon;
-        homeAlt = alt;
+        if (changed)
+        {
+            homeLat = lat;
+            homeLon = lon;
+            homeAlt = alt;
+            emit homePositionChanged(homeLat, homeLon, homeAlt);
+
+            // Update all UAVs
+            foreach (UASInterface* mav, systems)
+            {
+                mav->setHomePosition(homeLat, homeLon, homeAlt);
+            }
+        }
+    }
+    return changed;
+}
 
-        if (changed) emit homePositionChanged(homeLat, homeLon, homeAlt);
-        return true;
-    } else {
-        return false;
+/**
+ * This function will change QGC's home position on a number of conditions only
+ */
+void UASManager::uavChangedHomePosition(int uav, double lat, double lon, double alt)
+{
+    // FIXME: Accept any home position change for now from the active UAS
+    // this means that the currently select UAS can change the home location
+    // of the whole swarm. This makes sense, but more control might be needed
+    if (uav == activeUAS->getUASID())
+    {
+        if (setHomePosition(lat, lon, alt))
+        {
+            foreach (UASInterface* mav, systems)
+            {
+                // Only update the other systems, not the original source
+                if (mav->getUASID() != uav)
+                {
+                    mav->setHomePosition(homeLat, homeLon, homeAlt);
+                }
+            }
+        }
     }
 }
 
@@ -147,7 +187,10 @@ void UASManager::addUAS(UASInterface* uas)
     if (!systems.contains(uas)) {
         systems.append(uas);
         connect(uas, SIGNAL(destroyed(QObject*)), this, SLOT(removeUAS(QObject*)));
-        connect(this, SIGNAL(homePositionChanged(double,double,double)), uas, SLOT(setHomePosition(double,double,double)));
+        // Set home position on UAV if set in UI
+        // - this is done on a per-UAV basis
+        // Set home position in UI if UAV chooses a new one (caution! if multiple UAVs are connected, take care!)
+        connect(uas, SIGNAL(homePositionChanged(int,double,double,double)), this, SLOT(uavChangedHomePosition(int,double,double,double)));
         emit UASCreated(uas);
     }
 
diff --git a/src/uas/UASManager.h b/src/uas/UASManager.h
index 2a02f2a3761af2db055ce98003ca875bf9379a9a..0d42b8afb17e059129695261dc539431933a448b 100644
--- a/src/uas/UASManager.h
+++ b/src/uas/UASManager.h
@@ -174,9 +174,12 @@ public slots:
     /** @brief Shut down the onboard operating system down */
     bool shutdownActiveUAS();
 
-    /** @brief Set the current home position */
+    /** @brief Set the current home position on all UAVs*/
     bool setHomePosition(double lat, double lon, double alt);
 
+    /** @brief Update home position based on the position from one of the UAVs */
+    void uavChangedHomePosition(int uav, double lat, double lon, double alt);
+
     /** @brief Load settings */
     void loadSettings();
     /** @brief Store settings */