diff --git a/app/src/main/java/fr/nitorac/aurionweb/StorageManager.java b/app/src/main/java/fr/nitorac/aurionweb/StorageManager.java
index a0685c01d2566c5d85721deede2d6250e7e71b9a..b80e12be263b080add2f2309522ec712feed84f5 100644
--- a/app/src/main/java/fr/nitorac/aurionweb/StorageManager.java
+++ b/app/src/main/java/fr/nitorac/aurionweb/StorageManager.java
@@ -24,10 +24,11 @@ public class StorageManager {
         SharedPreferences pref = c.getSharedPreferences(StorageManager.SEC_SHARED_PREF, Context.MODE_PRIVATE);
         AurionCred cred = new AurionCred();
         cred.setLogin(pref.getString(AurionCred.LOGIN_KEY, ""));
-        if(cred.getLogin().isEmpty()){
+        String encrypted = pref.getString(AurionCred.PWD_KEY, "");
+        if(cred.getLogin().trim().isEmpty() || encrypted.trim().isEmpty()){
             return null;
         }
-        cred.setPlainPwd(SecurityManager.getSecurityHelper(c).decrypt(pref.getString(AurionCred.PWD_KEY, "")));
+        cred.setPlainPwd(SecurityManager.getSecurityHelper(c).decrypt(encrypted));
         cred.setRemember(pref.getBoolean(AurionCred.REM_KEY, false));
         return cred;
     }
diff --git a/app/src/main/java/fr/nitorac/aurionweb/aurionweb/AurionManager.java b/app/src/main/java/fr/nitorac/aurionweb/aurionweb/AurionManager.java
index 3b99ec8c0899791adbdb852785f360e672056cf6..a916571a1d1c23c11b8a5d33db9d9b017bae554d 100644
--- a/app/src/main/java/fr/nitorac/aurionweb/aurionweb/AurionManager.java
+++ b/app/src/main/java/fr/nitorac/aurionweb/aurionweb/AurionManager.java
@@ -34,8 +34,6 @@ public class AurionManager {
 
     }
 
-
-
     public boolean checkPassword(AurionSession session, AurionCred cred) throws GeneralSecurityException {
         if(session == null){
             session = new AurionSession();
diff --git a/app/src/main/java/fr/nitorac/aurionweb/aurionweb/CheckConnectionTask.java b/app/src/main/java/fr/nitorac/aurionweb/aurionweb/CheckConnectionTask.java
index 5f53c5f48411a8dd02e5deb05e6c5bf602c2982e..c674ab78abcf8715d8013b89ccc92c4ffcf86d7d 100644
--- a/app/src/main/java/fr/nitorac/aurionweb/aurionweb/CheckConnectionTask.java
+++ b/app/src/main/java/fr/nitorac/aurionweb/aurionweb/CheckConnectionTask.java
@@ -54,7 +54,9 @@ public class CheckConnectionTask extends AsyncTask<AurionCred, Void, Boolean> {
     protected Boolean doInBackground(AurionCred... cred) {
         try {
             boolean res = AurionManager.getInstance().checkPassword(session, cred[0]);
-            networkStuff.accept(session);
+            if(res){
+                networkStuff.accept(session);
+            }
             return res;
         } catch (GeneralSecurityException e) {
             e.printStackTrace();