diff --git a/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCChangeCourseInfo.java b/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCChangeCourseInfo.java
index 5845edc0ffc2..baad660b8210 100644
--- a/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCChangeCourseInfo.java
+++ b/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCChangeCourseInfo.java
@@ -5,6 +5,7 @@ import com.jetbrains.edu.coursecreator.actions.CCChangeCourseInfo;
 import com.jetbrains.edu.coursecreator.ui.CCNewProjectPanel;
 import com.jetbrains.edu.learning.courseFormat.Course;
 import com.jetbrains.python.PythonLanguage;
+import com.jetbrains.python.psi.LanguageLevel;
 
 import javax.swing.*;
 
@@ -35,6 +36,9 @@ public class PyCCChangeCourseInfo extends CCChangeCourseInfo {
     languageLevelCombobox.addItem(ALL_VERSIONS);
     languageLevelCombobox.addItem(PYTHON_3);
     languageLevelCombobox.addItem(PYTHON_2);
+    for (LanguageLevel level : LanguageLevel.values()) {
+      languageLevelCombobox.addItem(level.toString());
+    }
     languageLevelCombobox.setVisible(true);
     final String version = course.getLanguageVersion();
     if (version != null) {
diff --git a/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyDirectoryProjectGenerator.java b/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyDirectoryProjectGenerator.java
index 3d5e0bf51701..3b516f4af1e1 100644
--- a/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyDirectoryProjectGenerator.java
+++ b/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyDirectoryProjectGenerator.java
@@ -235,6 +235,12 @@ public class PyStudyDirectoryProjectGenerator extends PythonProjectGenerator imp
       if (PyStudyLanguageManager.PYTHON_2.equals(version)) {
         baseLevel = LanguageLevel.PYTHON27;
       }
+      else if (PyStudyLanguageManager.PYTHON_3.equals(version)) {
+        baseLevel = LanguageLevel.PYTHON31;
+      }
+      else if (version != null) {
+        baseLevel = LanguageLevel.fromPythonVersion(version);
+      }
     }
     final PythonSdkFlavor flavor = PythonSdkFlavor.getApplicableFlavors(false).get(0);
     String baseSdk = null;