diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StepicStudyOptions.java b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StepicStudyOptions.java
index 8039f880fb55..f7751f1f01db 100644
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StepicStudyOptions.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StepicStudyOptions.java
@@ -120,10 +120,8 @@ public class StepicStudyOptions implements StudyOptionsProvider {
     if (project != null) {
       StudyTaskManager taskManager = StudyTaskManager.getInstance(project);
       final StepicUser user = taskManager.getUser();
-      if (user != null) {
-        setLogin(user.getEmail());
-        setPassword(DEFAULT_PASSWORD_TEXT);
-      }
+      setLogin(user.getEmail());
+      setPassword(DEFAULT_PASSWORD_TEXT);
       myEnableTestingFromSamples.setSelected(taskManager.isEnableTestingFromSamples());
       resetCredentialsModification();
     }