diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/LoginDialog.java b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/LoginDialog.java
index e483adc8df31..9f0a2779f936 100644
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/LoginDialog.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/LoginDialog.java
@@ -1,7 +1,10 @@
 package com.jetbrains.edu.learning.stepic;
 
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.project.ProjectUtil;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.util.text.StringUtil;
+import com.jetbrains.edu.learning.StudyTaskManager;
 import com.jetbrains.edu.learning.ui.LoginPanel;
 import org.jetbrains.annotations.NotNull;
 
@@ -44,6 +47,10 @@ public class LoginDialog extends DialogWrapper {
     final StepicUser user = EduStepicConnector.login(myLoginPanel.getLogin(), myLoginPanel.getPassword());
     if (user != null) {
       doJustOkAction();
+      final Project project = ProjectUtil.guessCurrentProject(myLoginPanel.getContentPanel());
+      user.setEmail(myLoginPanel.getLogin());
+      user.setPassword(myLoginPanel.getPassword());
+      StudyTaskManager.getInstance(project).setUser(user);
     }
     else {
       setErrorText("Login failed");