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 f7751f1f01db..a0d4e70aa74d 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
@@ -107,7 +107,8 @@ public class StepicStudyOptions implements StudyOptionsProvider {
 
   @NotNull
   private String getPassword() {
-    return String.valueOf(myPasswordField.getPassword());
+    final String passwordText = String.valueOf(myPasswordField.getPassword());
+    return passwordText.equals(DEFAULT_PASSWORD_TEXT) ? "" : passwordText;
   }
 
   private void setPassword(@NotNull final String password) {
@@ -142,11 +143,12 @@ public class StepicStudyOptions implements StudyOptionsProvider {
       if (project != null) {
         StudyTaskManager taskManager = StudyTaskManager.getInstance(project);
         taskManager.setEnableTestingFromSamples(myEnableTestingFromSamples.isSelected());
-        final StepicUser user = taskManager.getUser();
-        user.setEmail(getLogin());
-        user.setPassword(getPassword());
-        if (!StringUtil.isEmptyOrSpaces(getLogin()) && !StringUtil.isEmptyOrSpaces(getPassword())) {
-          EduStepicConnector.login(getLogin(), getPassword());
+        final String login = getLogin();
+        final String password = getPassword();
+        if (!StringUtil.isEmptyOrSpaces(login) && !StringUtil.isEmptyOrSpaces(password)) {
+          final StepicUser user = taskManager.getUser();
+          user.setEmail(login);
+          user.setPassword(password);
         }
       }
       else {