diff --git a/app/build.gradle b/app/build.gradle
index db5a17c..345ea9b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "org.deke.risk.riskahead"
         minSdkVersion 19
         targetSdkVersion 26
-        versionCode 50
-        versionName "3.1.6"
+        versionCode 52
+        versionName "3.1.8"
         multiDexEnabled true
     }
     buildTypes {
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
index fd28019..834de77 100644
Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 3c3712c..533ae45 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":50,"versionName":"3.1.6","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":52,"versionName":"3.1.8","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/org/deke/risk/riskahead/LoginActivity.java b/app/src/main/java/org/deke/risk/riskahead/LoginActivity.java
index abf4de2..3786c0b 100644
--- a/app/src/main/java/org/deke/risk/riskahead/LoginActivity.java
+++ b/app/src/main/java/org/deke/risk/riskahead/LoginActivity.java
@@ -63,6 +63,8 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
     private ProgressDialog pDialog;
     private SessionManager session;
 
+    static boolean active = false;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -91,6 +93,18 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
         }
     }
 
+    @Override
+    public void onStart() {
+        super.onStart();
+        active = true;
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        active = false;
+    }
+
     public void isNetworkAvailable() {
         NetworkInfo activeNetworkInfo = null;
 
@@ -876,7 +890,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
             try {
                 JSONObject jObj = new JSONObject(response);
                 boolean error = jObj.getBoolean("error");
-                if (!error) {
+                if (!error && active) {
                     new AlertDialog.Builder(LoginActivity.this)
                             .setTitle(getString(R.string.alert_accregistration_title))
                             .setMessage(getString(R.string.alert_accregistration_text))
@@ -890,7 +904,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
                             })
                             .setIcon(android.R.drawable.ic_dialog_alert)
                             .show();
-                } else {
+                } else if (error){
                     String errorMsg = jObj.getString("error_msg");
                     Crashlytics.log(Log.ERROR, TAG, "Error occured: "+errorMsg);
                     Toast.makeText(getApplicationContext(), getResources().getString(R.string.txt_errormsg_register), Toast.LENGTH_LONG).show();
diff --git a/app/src/main/java/org/deke/risk/riskahead/adapter/SpinnerHintAdapter.java b/app/src/main/java/org/deke/risk/riskahead/adapter/SpinnerHintAdapter.java
index 31b03d1..f0685ab 100644
--- a/app/src/main/java/org/deke/risk/riskahead/adapter/SpinnerHintAdapter.java
+++ b/app/src/main/java/org/deke/risk/riskahead/adapter/SpinnerHintAdapter.java
@@ -2,6 +2,8 @@ package org.deke.risk.riskahead.adapter;
 
 import android.content.Context;
 import android.database.DataSetObserver;
+import android.nfc.Tag;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -42,14 +44,16 @@ public class SpinnerHintAdapter implements SpinnerAdapter, ListAdapter {
 
     @Override
     public final View getView(int position, View convertView, ViewGroup parent) {
-        if (position == 0) {
-            isInInitialState = true;
+        isInInitialState = position == 0;
+
+        if (isInInitialState) {
             return getNothingSelectedView(parent);
+        }else{
+            int numOfItems = adapter.getCount();
+            position = (position > numOfItems-1) ? numOfItems-1 : position;
+
+            return adapter.getView(position - EXTRA, null, parent);
         }
-        isInInitialState = false;
-
-        return adapter.getView(position - EXTRA, null, parent); // Could re-use
-
     }
 
     protected View getNothingSelectedView(ViewGroup parent) {