diff --git a/opensrp-reveal/build.gradle b/opensrp-reveal/build.gradle
index de7dd8244..765c4fef7 100644
--- a/opensrp-reveal/build.gradle
+++ b/opensrp-reveal/build.gradle
@@ -58,7 +58,7 @@ android {
         minSdkVersion 26
         targetSdkVersion 28
         versionCode 75
-        versionName "10.4.4"
+        versionName "10.4.5"
         multiDexEnabled true
         buildConfigField "long", "MAX_SERVER_TIME_DIFFERENCE", "1800000l"
         buildConfigField "boolean", "TIME_CHECK", "false"
@@ -155,13 +155,13 @@ android {
         }
 
         debug {
-            resValue "string", 'opensrp_base_url', '"https://api-isg-mz-uat.akros.online/"'
+            resValue "string", 'opensrp_base_url', '"https://api-ef-ke-uat.akros.online/"'
             buildConfigField "Integer", "DATABASE_VERSION", '14'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '250'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '100'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '2'
             buildConfigField "long", "SYNC_INTERVAL_IN_MINUTES", '480'
-            buildConfigField "org.smartregister.reveal.util.Country", "BUILD_COUNTRY", "org.smartregister.reveal.util.Country.MOZAMBIQUE"
+            buildConfigField "org.smartregister.reveal.util.Country", "BUILD_COUNTRY", "org.smartregister.reveal.util.Country.KENYA"
             buildConfigField "long", "PULL_UNIQUE_IDS_MINUTES", '15'
             buildConfigField "String", "ADMIN_PASSWORD_NOT_NEAR_STRUCTURES", '"AdminPass1"'
             buildConfigField "float", "MY_LOCATION_BUFFER", '25'
diff --git a/opensrp-reveal/src/main/java/org/smartregister/reveal/presenter/ListTaskPresenter.java b/opensrp-reveal/src/main/java/org/smartregister/reveal/presenter/ListTaskPresenter.java
index d61053d11..59f042498 100644
--- a/opensrp-reveal/src/main/java/org/smartregister/reveal/presenter/ListTaskPresenter.java
+++ b/opensrp-reveal/src/main/java/org/smartregister/reveal/presenter/ListTaskPresenter.java
@@ -425,7 +425,7 @@ public void validateUserLocation() {
     @Override
     public void onGetUserLocation(Location location) {
         Feature userFeature = getFeatureUserIsIn(location);
-        if (userFeature == null || !Objects.equals(userFeature.id(), selectedFeature.id())) {
+        if (validateFarStructures() && userFeature == null || !Objects.equals(userFeature.id(), selectedFeature.id())) {
             requestUserPassword();
         }
         else {
diff --git a/opensrp-reveal/src/main/java/org/smartregister/reveal/presenter/ValidateUserLocationPresenter.java b/opensrp-reveal/src/main/java/org/smartregister/reveal/presenter/ValidateUserLocationPresenter.java
index fc94ba271..e32518c46 100644
--- a/opensrp-reveal/src/main/java/org/smartregister/reveal/presenter/ValidateUserLocationPresenter.java
+++ b/opensrp-reveal/src/main/java/org/smartregister/reveal/presenter/ValidateUserLocationPresenter.java
@@ -56,7 +56,7 @@ public void onGetUserLocation(Location location) {
             double offset = callback.getTargetCoordinates().distanceTo(
                     new LatLng(location.getLatitude(), location.getLongitude()));
          appExecutors.diskIO().execute(() -> logAdminPassRequiredEvent(location,offset > Utils.getLocationBuffer(isCurrentTargetLevelStructure()) && validateFarStructures()));
-         if (offset > Utils.getLocationBuffer(isCurrentTargetLevelStructure()) && validateFarStructures()) {
+         if (validateFarStructures() && offset > Utils.getLocationBuffer(isCurrentTargetLevelStructure())) {
                 callback.requestUserPassword();
             } else {
                 callback.onLocationValidated();
@@ -66,7 +66,9 @@ public void onGetUserLocation(Location location) {
     @Override
     public void onGetUserLocationFailed() {
         locationView.hideProgressDialog();
-        callback.requestUserPassword();
+        if(validateFarStructures()){
+            callback.requestUserPassword();
+        }
     }
 
     @Override