diff --git a/python/educational-core/resources/META-INF/plugin.xml b/python/educational-core/resources/META-INF/plugin.xml
index 3fe650f261e5..78f53d33f08b 100644
--- a/python/educational-core/resources/META-INF/plugin.xml
+++ b/python/educational-core/resources/META-INF/plugin.xml
@@ -83,9 +83,8 @@
     <action id="StudySwitchPanel" class="com.jetbrains.edu.learning.actions.StudySwitchTaskPanelAction"
             text="Switch Task Description Panel">
     </action>
-    <action id="Edu.OpenTaskInStepik" class="com.jetbrains.edu.learning.actions.StudyOpenTaskInStepikAction"
-            text="Open this task in Stepik">
-    </action>
+
+    <action id="Edu.UpdateRecommendation" class="com.jetbrains.edu.learning.actions.StudyUpdateRecommendationAction"/>
 
     <!--course creator-->
     <action id="CreateLesson" class="com.jetbrains.edu.coursecreator.actions.CCCreateLesson">
diff --git a/python/educational-core/resources/code-mirror/template.html b/python/educational-core/resources/code-mirror/template.html
index e7d2348fab7c..1614b950ac3f 100644
--- a/python/educational-core/resources/code-mirror/template.html
+++ b/python/educational-core/resources/code-mirror/template.html
@@ -21,18 +21,37 @@
   <script src="${language_script}"></script>
   <!--suppress CssInvalidPropertyValue -->
   <style media="screen" type="text/css">
-    body {
+    html, body {
+      height:100%;
+      overflow:hidden;
       font-size: ${font_size}pt !important;
     }
+    .wrapper {
+      overflow-y:scroll;
+      height: 96%;
+    }
+
+    /*used to place task on Stepik link*/
+    /*noinspection CssUnusedSymbol*/
+    .footer {
+      position:fixed;
+      line-height: 3.5em;
+      bottom: 0;
+      height: 4%;
+      width: 95%;
+      text-align: right;
+    }
 
   </style>
 </head>
 <body>
+<div class=wrapper>
 ${code}
+</div>
 <script>
   var nodeList = document.body.getElementsByTagName("code");
   nodes = Array.prototype.slice.call(nodeList, 0);
-  
+
   nodes.forEach(function (node) {
     var text = node.innerHTML
     node.innerHTML = text.replace(/<br\s*>/g, '\n')
diff --git a/python/educational-core/src/com/jetbrains/edu/coursecreator/stepik/CCStepicConnector.java b/python/educational-core/src/com/jetbrains/edu/coursecreator/stepik/CCStepicConnector.java
index 0000b9d289e7..8d0b13ac66df 100644
--- a/python/educational-core/src/com/jetbrains/edu/coursecreator/stepik/CCStepicConnector.java
+++ b/python/educational-core/src/com/jetbrains/edu/coursecreator/stepik/CCStepicConnector.java
@@ -331,9 +331,9 @@ public class CCStepicConnector {
 
   private static void showStepicNotification(@NotNull Project project,
                                              @NotNull NotificationType notificationType, @NotNull String failedActionName) {
-    String text = "Authorize on Stepik to " + failedActionName;
+    String text = "Log in to Stepik to " + failedActionName;
     Notification notification = new Notification("Stepik", "Failed to " + failedActionName, text, notificationType);
-    notification.addAction(new AnAction("Authorize") {
+    notification.addAction(new AnAction("Log in") {
 
       @Override
       public void actionPerformed(AnActionEvent e) {
diff --git a/python/educational-core/src/com/jetbrains/edu/learning/EduPluginConfigurator.java b/python/educational-core/src/com/jetbrains/edu/learning/EduPluginConfigurator.java
index ea63cc699664..d6429b5bfce3 100644
--- a/python/educational-core/src/com/jetbrains/edu/learning/EduPluginConfigurator.java
+++ b/python/educational-core/src/com/jetbrains/edu/learning/EduPluginConfigurator.java
@@ -120,7 +120,7 @@ public interface EduPluginConfigurator {
       StudyNextTaskAction.ACTION_ID,
       StudyRefreshTaskFileAction.ACTION_ID,
       StudyShowHintAction.ACTION_ID,
-      StudyOpenTaskInStepikAction.ACTION_ID,
+      StudyUpdateRecommendationAction.ACTION_ID
     };
     ActionManager actionManager = ActionManager.getInstance();
     Arrays.stream(ids)
diff --git a/python/educational-core/src/com/jetbrains/edu/learning/StudyProjectComponent.java b/python/educational-core/src/com/jetbrains/edu/learning/StudyProjectComponent.java
index 607343b87e07..85b5889ee1ca 100644
--- a/python/educational-core/src/com/jetbrains/edu/learning/StudyProjectComponent.java
+++ b/python/educational-core/src/com/jetbrains/edu/learning/StudyProjectComponent.java
@@ -95,6 +95,7 @@ public class StudyProjectComponent implements ProjectComponent {
           instance.setHideToolStripes(false);
           instance.fireUISettingsChanged();
           registerShortcuts();
+          addStepicWidget();
           EduUsagesCollector.projectTypeOpened(course.isAdaptive() ? EduNames.ADAPTIVE : EduNames.STUDY);
         }
       })));
@@ -110,6 +111,10 @@ public class StudyProjectComponent implements ProjectComponent {
       }
     });
 
+    selectStep();
+  }
+
+  private void addStepicWidget() {
     StudyStepicUserWidget widget = StudyUtils.getStepicWidget();
     if (widget == null) {
       StatusBar statusBar = WindowManager.getInstance().getStatusBar(myProject);
@@ -118,8 +123,6 @@ public class StudyProjectComponent implements ProjectComponent {
     else {
       widget.update();
     }
-
-    selectStep();
   }
 
   private void selectStep() {
diff --git a/python/educational-core/src/com/jetbrains/edu/learning/StudyUtils.java b/python/educational-core/src/com/jetbrains/edu/learning/StudyUtils.java
index 3e038ee87938..5460241dcab9 100644
--- a/python/educational-core/src/com/jetbrains/edu/learning/StudyUtils.java
+++ b/python/educational-core/src/com/jetbrains/edu/learning/StudyUtils.java
@@ -67,6 +67,7 @@ import com.jetbrains.edu.learning.courseFormat.tasks.Task;
 import com.jetbrains.edu.learning.courseFormat.tasks.TaskWithSubtasks;
 import com.jetbrains.edu.learning.courseFormat.tasks.TheoryTask;
 import com.jetbrains.edu.learning.editor.StudyEditor;
+import com.jetbrains.edu.learning.stepic.EduStepikUtils;
 import com.jetbrains.edu.learning.stepic.OAuthDialog;
 import com.jetbrains.edu.learning.stepic.StepicUser;
 import com.jetbrains.edu.learning.ui.StudyStepicUserWidget;
@@ -430,14 +431,23 @@ public class StudyUtils {
   }
 
   private static String wrapAdaptiveCourseText(Task task, @NotNull String text) {
+    String finalText = text;
     if (task instanceof TheoryTask) {
-      return text + "\n\n<b>Note</b>: This theory task aims to help you solve difficult tasks. " +
+      finalText += "\n\n<b>Note</b>: This theory task aims to help you solve difficult tasks. " +
              "Please, read it and press \"Check\" to go further.";
     }
     else if (!(task instanceof ChoiceTask)) {
-      return text + "\n\n<b>Note</b>: Use standard input to obtain input for the task.";
+      finalText += "\n\n<b>Note</b>: Use standard input to obtain input for the task.";
     }
-    return text;
+    finalText += getFooterWithLink(task);
+
+    return finalText;
+  }
+
+  @NotNull
+  private static String getFooterWithLink(Task task) {
+    return
+    "<div class=\"footer\">" + "<a href=" + EduStepikUtils.getAdaptiveLink(task) + ">Open on Stepik</a>"  + "</div>";
   }
 
   @NotNull
diff --git a/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyOpenTaskInStepikAction.java b/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyOpenTaskInStepikAction.java
deleted file mode 100644
index 021e24de1e60..000000000000
--- a/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyOpenTaskInStepikAction.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.jetbrains.edu.learning.actions;
-
-import com.intellij.ide.BrowserUtil;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.actionSystem.KeyboardShortcut;
-import com.intellij.openapi.actionSystem.Presentation;
-import com.intellij.openapi.keymap.KeymapUtil;
-import com.intellij.openapi.project.Project;
-import com.jetbrains.edu.learning.StudyUtils;
-import com.jetbrains.edu.learning.courseFormat.tasks.Task;
-import com.jetbrains.edu.learning.stepic.EduStepikUtils;
-import icons.EducationalCoreIcons;
-import org.jetbrains.annotations.NotNull;
-
-import javax.swing.*;
-
-public class StudyOpenTaskInStepikAction extends StudyActionWithShortcut {
-  public static final String SHORTCUT = "ctrl alt pressed HOME";
-  public static final String ACTION_ID = "Edu.OpenTaskInStepik";
-  private static final String TEXT = "Open this task in Stepik";
-
-  public StudyOpenTaskInStepikAction() {
-    super(getTextWithShortcuts(), TEXT, EducationalCoreIcons.Stepik);
-  }
-
-  @NotNull
-  private static String getTextWithShortcuts() {
-    return TEXT + "(" + KeymapUtil.getShortcutText(new KeyboardShortcut(KeyStroke.getKeyStroke(SHORTCUT), null)) + ")";
-  }
-
-  @Override
-  public void actionPerformed(@NotNull AnActionEvent e) {
-    Project project = e.getProject();
-    if (project == null) {
-      return;
-    }
-    Task currentTask = StudyUtils.getCurrentTask(project);
-
-    String link = EduStepikUtils.getLink(currentTask);
-    if (link != null) {
-      BrowserUtil.browse(link);
-    }
-  }
-
-  @Override
-  public void update(AnActionEvent e) {
-    final Presentation presentation = e.getPresentation();
-    StudyUtils.updateAction(e);
-    Project project = e.getProject();
-    if (project == null) {
-      presentation.setVisible(false);
-      return;
-    }
-    Task currentTask = StudyUtils.getCurrentTask(project);
-
-    String link = EduStepikUtils.getLink(currentTask);
-    boolean visible = link != null;
-    presentation.setVisible(visible);
-    presentation.setEnabled(visible);
-    if (visible) {
-      presentation.setText(getTextWithShortcuts() + '\n' + link);
-    }
-  }
-
-  @NotNull
-  @Override
-  public String getActionId() {
-    return ACTION_ID;
-  }
-
-  @Override
-  public String[] getShortcuts() {
-    return new String[]{SHORTCUT};
-  }
-}
diff --git a/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyUpdateRecommendationAction.java b/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyUpdateRecommendationAction.java
new file mode 100644
index 000000000000..412698af36f3
--- /dev/null
+++ b/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyUpdateRecommendationAction.java
@@ -0,0 +1,77 @@
+package com.jetbrains.edu.learning.actions;
+
+import com.intellij.ide.projectView.ProjectView;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.Presentation;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.progress.ProgressManager;
+import com.intellij.openapi.project.DumbAwareAction;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.vfs.VirtualFileManager;
+import com.jetbrains.edu.learning.StudyTaskManager;
+import com.jetbrains.edu.learning.StudyUtils;
+import com.jetbrains.edu.learning.courseFormat.Course;
+import com.jetbrains.edu.learning.courseFormat.Lesson;
+import com.jetbrains.edu.learning.courseFormat.RemoteCourse;
+import com.jetbrains.edu.learning.courseFormat.tasks.Task;
+import com.jetbrains.edu.learning.navigation.StudyNavigator;
+import com.jetbrains.edu.learning.stepic.EduAdaptiveStepicConnector;
+import icons.EducationalCoreIcons;
+
+public class StudyUpdateRecommendationAction extends DumbAwareAction {
+  public static final String ACTION_ID = "Edu.UpdateRecommendation";
+
+  public StudyUpdateRecommendationAction() {
+    super("Update course", "Update course", EducationalCoreIcons.Stepik);
+  }
+
+  @Override
+  public void actionPerformed(AnActionEvent e) {
+    Project project = e.getProject();
+    assert project != null;
+
+    Course course = StudyTaskManager.getInstance(project).getCourse();
+    assert course != null;
+
+    Lesson adaptiveLesson = course.getLessons().get(0);
+    assert adaptiveLesson != null;
+
+    int taskNumber = adaptiveLesson.getTaskList().size();
+    Task lastRecommendationInCourse = adaptiveLesson.getTaskList().get(taskNumber - 1);
+    Task lastRecommendationOnStepik = ProgressManager.getInstance().runProcessWithProgressSynchronously(
+      () -> {
+        ProgressManager.getInstance().getProgressIndicator().setIndeterminate(true);
+        return StudyUtils.execCancelable(() -> EduAdaptiveStepicConnector.getNextRecommendation(project, (RemoteCourse)course));
+      },
+      "Updating Course", true, project);
+
+    if (lastRecommendationOnStepik != null && lastRecommendationOnStepik.getStepId() != lastRecommendationInCourse.getStepId()) {
+      lastRecommendationOnStepik.initTask(adaptiveLesson, false);
+      EduAdaptiveStepicConnector.replaceCurrentTask(project, lastRecommendationOnStepik, adaptiveLesson);
+      ApplicationManager.getApplication().invokeLater(() -> {
+        VirtualFileManager.getInstance().refreshWithoutFileWatcher(false);
+        ProjectView.getInstance(project).refresh();
+        StudyNavigator.navigateToTask(project, lastRecommendationOnStepik);
+      });
+    }
+  }
+
+  @Override
+  public void update(AnActionEvent e) {
+    Presentation presentation = e.getPresentation();
+
+    Project project = e.getProject();
+    if (project == null) {
+      presentation.setEnabledAndVisible(false);
+      return;
+    }
+
+    Course course = StudyTaskManager.getInstance(project).getCourse();
+    if (course == null || !course.isAdaptive()) {
+      presentation.setEnabledAndVisible(false);
+      return;
+    }
+
+    presentation.setEnabledAndVisible(true);
+  }
+}
diff --git a/python/educational-core/src/com/jetbrains/edu/learning/builtInServer/EduStepikRestService.java b/python/educational-core/src/com/jetbrains/edu/learning/builtInServer/EduStepikRestService.java
index 23e7e3f409e2..f5dd5d3c6e15 100644
--- a/python/educational-core/src/com/jetbrains/edu/learning/builtInServer/EduStepikRestService.java
+++ b/python/educational-core/src/com/jetbrains/edu/learning/builtInServer/EduStepikRestService.java
@@ -122,14 +122,14 @@ public class EduStepikRestService extends RestService {
         if (stepicUser != null) {
           StudySettings.getInstance().setUser(stepicUser);
           sendHtmlResponse(request, context, "/oauthResponsePages/okPage.html");
-          showStepicNotification(NotificationType.INFORMATION, "Authorized as " + stepicUser.getFirstName() + " " + stepicUser.getLastName());
+          showStepicNotification(NotificationType.INFORMATION, "Logged in as " + stepicUser.getFirstName() + " " + stepicUser.getLastName());
           focusOnApplicationWindow();
           return null;
         }
       }
 
       sendHtmlResponse(request, context, "/oauthResponsePages/errorPage.html");
-      showStepicNotification(NotificationType.ERROR, "Failed to authorize");
+      showStepicNotification(NotificationType.ERROR, "Failed to log in");
       return "Couldn't find code parameter for Stepik OAuth";
     }
 
diff --git a/python/educational-core/src/com/jetbrains/edu/learning/newproject/ui/EduCoursesPanel.java b/python/educational-core/src/com/jetbrains/edu/learning/newproject/ui/EduCoursesPanel.java
index 66d74d89622a..0fdfae900dbf 100644
--- a/python/educational-core/src/com/jetbrains/edu/learning/newproject/ui/EduCoursesPanel.java
+++ b/python/educational-core/src/com/jetbrains/edu/learning/newproject/ui/EduCoursesPanel.java
@@ -28,6 +28,7 @@ import com.intellij.util.ui.UIUtil;
 import com.jetbrains.edu.learning.EduPluginConfigurator;
 import com.jetbrains.edu.learning.StudySettings;
 import com.jetbrains.edu.learning.StudyUtils;
+import com.jetbrains.edu.learning.core.EduNames;
 import com.jetbrains.edu.learning.courseFormat.Course;
 import com.jetbrains.edu.learning.courseFormat.RemoteCourse;
 import com.jetbrains.edu.learning.courseGeneration.StudyProjectGenerator;
@@ -440,7 +441,7 @@ public class EduCoursesPanel extends JPanel {
     List<String> tags = new ArrayList<>();
     tags.add(course.getLanguageById().getDisplayName());
     if (course.isAdaptive()) {
-      tags.add("Adaptive");
+      tags.add(EduNames.ADAPTIVE);
     }
     return tags;
   }
diff --git a/python/educational-core/src/com/jetbrains/edu/learning/stepic/EduAdaptiveStepicConnector.java b/python/educational-core/src/com/jetbrains/edu/learning/stepic/EduAdaptiveStepicConnector.java
index 2a6c9ac41d70..b55d3bbeebca 100644
--- a/python/educational-core/src/com/jetbrains/edu/learning/stepic/EduAdaptiveStepicConnector.java
+++ b/python/educational-core/src/com/jetbrains/edu/learning/stepic/EduAdaptiveStepicConnector.java
@@ -300,7 +300,7 @@ public class EduAdaptiveStepicConnector {
     if (user == null) {
       LOG.warn("Can't get next recommendation: user is null");
       ApplicationManager.getApplication().invokeLater(() -> StudyUtils.showErrorPopupOnToolbar(project,
-                                                                                               "Can't get next recommendation: you're not authorized"));
+                                                                                               "Can't get next recommendation: you're not logged in"));
       return;
     }
 
@@ -363,7 +363,7 @@ public class EduAdaptiveStepicConnector {
     }
   }
 
-  private static void replaceCurrentTask(@NotNull Project project, @NotNull Task task, @NotNull Lesson lesson) {
+  public static void replaceCurrentTask(@NotNull Project project, @NotNull Task task, @NotNull Lesson lesson) {
     Course course = StudyTaskManager.getInstance(project).getCourse();
     assert course != null;
 
diff --git a/python/educational-core/src/com/jetbrains/edu/learning/stepic/EduStepicConnector.java b/python/educational-core/src/com/jetbrains/edu/learning/stepic/EduStepicConnector.java
index 4320279884c0..e115b9deac5a 100644
--- a/python/educational-core/src/com/jetbrains/edu/learning/stepic/EduStepicConnector.java
+++ b/python/educational-core/src/com/jetbrains/edu/learning/stepic/EduStepicConnector.java
@@ -260,7 +260,7 @@ public class EduStepicConnector {
     }
     else {
       final Lesson lesson = new Lesson();
-      lesson.setName("Adaptive");
+      lesson.setName(EduNames.ADAPTIVE);
       remoteCourse.addLesson(lesson);
       //TODO: more specific name?
       final Task recommendation = EduAdaptiveStepicConnector.getNextRecommendation(project, remoteCourse);
diff --git a/python/educational-core/src/com/jetbrains/edu/learning/stepic/EduStepikUtils.java b/python/educational-core/src/com/jetbrains/edu/learning/stepic/EduStepikUtils.java
index 83190dd50cf1..00516167744e 100644
--- a/python/educational-core/src/com/jetbrains/edu/learning/stepic/EduStepikUtils.java
+++ b/python/educational-core/src/com/jetbrains/edu/learning/stepic/EduStepikUtils.java
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.Nullable;
 
 public class EduStepikUtils {
   @Nullable
-  public static String getLink(@Nullable Task task) {
+  public static String getLink(@Nullable Task task, int stepNumber) {
     if (task == null) {
       return null;
     }
@@ -31,6 +31,12 @@ public class EduStepikUtils {
       return null;
     }
 
-    return String.format("%s/lesson/%d/step/%d", EduStepicNames.STEPIC_URL, lesson.getId(), task.getPosition());
+    return String.format("%s/lesson/%d/step/%d", EduStepicNames.STEPIC_URL, lesson.getId(), stepNumber);
+  }
+
+  @Nullable
+  public static String getAdaptiveLink(@Nullable Task task) {
+    String link = getLink(task, 1);
+    return link == null ? null : link + "?adaptive=true";
   }
 }
diff --git a/python/educational-core/src/com/jetbrains/edu/learning/stepic/StepicStudyOptions.java b/python/educational-core/src/com/jetbrains/edu/learning/stepic/StepicStudyOptions.java
index 25cc37c97b40..2fb8dbc82f3a 100644
--- a/python/educational-core/src/com/jetbrains/edu/learning/stepic/StepicStudyOptions.java
+++ b/python/educational-core/src/com/jetbrains/edu/learning/stepic/StepicStudyOptions.java
@@ -15,23 +15,19 @@
  */
 package com.jetbrains.edu.learning.stepic;
 
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.options.ConfigurationException;
-import com.intellij.openapi.progress.ProgressManager;
-import com.intellij.openapi.project.DefaultProjectFactory;
 import com.intellij.ui.HoverHyperlinkLabel;
 import com.intellij.ui.HyperlinkAdapter;
 import com.intellij.ui.components.JBCheckBox;
 import com.intellij.ui.components.JBLabel;
 import com.jetbrains.edu.learning.StudySettings;
-import com.jetbrains.edu.learning.StudyUtils;
 import com.jetbrains.edu.learning.settings.StudyOptionsProvider;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import javax.swing.event.HyperlinkEvent;
-import java.util.concurrent.Callable;
-import java.util.concurrent.TimeUnit;
 
 public class StepicStudyOptions implements StudyOptionsProvider {
   private JPanel myPane;
@@ -61,32 +57,16 @@ public class StepicStudyOptions implements StudyOptionsProvider {
 
       @Override
       protected void hyperlinkActivated(HyperlinkEvent e) {
-        StudySettings studySettings = StudySettings.getInstance();
-        StepicUser oldUser = studySettings.getUser();
-        EduStepicConnector.doAuthorize(() -> showDialog());
-
-        ProgressManager.getInstance()
-          .runProcessWithProgressSynchronously(() -> {
-                                                 ProgressManager.getInstance().getProgressIndicator().setIndeterminate(true);
-                                                 StudyUtils.execCancelable(waitForUserToBeSet(studySettings, oldUser));
-                                               }, "Authorizing",
-                                               true,
-                                               DefaultProjectFactory.getInstance().getDefaultProject());
-      }
-
-      @NotNull
-      private Callable<Object> waitForUserToBeSet(StudySettings studySettings, StepicUser oldUser) {
-        return () -> {
-          StepicUser newUser = studySettings.getUser();
-          while (newUser == null || newUser.equals(oldUser)) {
-            TimeUnit.MILLISECONDS.sleep(500);
-            newUser = studySettings.getUser();
+        ApplicationManager.getApplication().getMessageBus().connect().subscribe(StudySettings.SETTINGS_CHANGED, () -> {
+          StepicUser user = StudySettings.getInstance().getUser();
+          if (user != null && !user.equals(myStepicUser)) {
+            StudySettings.getInstance().setUser(myStepicUser);
+            myStepicUser = user;
+            updateLoginLabels(myStepicUser);
           }
-          StudySettings.getInstance().setUser(myStepicUser);
-          myStepicUser = newUser;
-          updateLoginLabels(myStepicUser);
-          return null;
-        };
+        });
+
+        EduStepicConnector.doAuthorize(() -> showDialog());
       }
     };
   }
@@ -122,7 +102,7 @@ public class StepicStudyOptions implements StudyOptionsProvider {
 
     if (stepicUser == null) {
       myUsernameLabel.setText("You're not logged in");
-      myHoverHyperlinkLabel.setText("Authorize on Stepik");
+      myHoverHyperlinkLabel.setText("Log in to Stepik");
 
       myListener = createAuthorizeListener();
       myHoverHyperlinkLabel.addHyperlinkListener(myListener);
diff --git a/python/educational-core/src/com/jetbrains/edu/learning/ui/StudyStepicUserWidget.java b/python/educational-core/src/com/jetbrains/edu/learning/ui/StudyStepicUserWidget.java
index cc9492dff1b6..3aab044aec2b 100644
--- a/python/educational-core/src/com/jetbrains/edu/learning/ui/StudyStepicUserWidget.java
+++ b/python/educational-core/src/com/jetbrains/edu/learning/ui/StudyStepicUserWidget.java
@@ -92,7 +92,7 @@ public class StudyStepicUserWidget implements IconLikeCustomStatusBarWidget {
       setLayout(layout);
 
       if (user == null) {
-        createUserPanel("You're not logged in", "Authorize on Stepik", createAuthorizeUserListener());
+        createUserPanel("You're not logged in", "Log in to Stepik", createAuthorizeUserListener());
       }
       else {
         String firstName = user.getFirstName();
diff --git a/python/educational-python/src/com/jetbrains/python/edu/PyStudyInstructionPainter.java b/python/educational-python/src/com/jetbrains/python/edu/PyStudyInstructionPainter.java
index f2c9dc8c63df..641183528a3a 100644
--- a/python/educational-python/src/com/jetbrains/python/edu/PyStudyInstructionPainter.java
+++ b/python/educational-python/src/com/jetbrains/python/edu/PyStudyInstructionPainter.java
@@ -23,6 +23,5 @@ public class PyStudyInstructionPainter extends EditorEmptyTextPainter {
     appendAction(painter, "Reset current task file", getActionShortcutText(StudyRefreshTaskFileAction.ACTION_ID));
     appendAction(painter, "Check task", getActionShortcutText(StudyCheckAction.ACTION_ID));
     appendAction(painter, "Get hint for the answer placeholder", getActionShortcutText(StudyShowHintAction.ACTION_ID));
-    appendAction(painter, "Open this task in Stepik", getActionShortcutText(StudyOpenTaskInStepikAction.ACTION_ID));
   }
 }
\ No newline at end of file
