diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -19,6 +19,7 @@
 //= require select2
 //= require ace-rails-ap
 //= require ace/mode-c_cpp
+//= require ace/mode-python
 //= require ace/mode-ruby
 //= require ace/mode-pascal
 //= require ace/mode-javascript
diff --git a/app/views/sources/direct_edit.html.haml b/app/views/sources/direct_edit.html.haml
--- a/app/views/sources/direct_edit.html.haml
+++ b/app/views/sources/direct_edit.html.haml
@@ -21,7 +21,7 @@
 
         .form-group
           = label_tag 'Language'
-          = select_tag 'language_id', options_from_collection_for_select(Language.all, 'id', 'pretty_name', @lang_id || Language.first.id), class: 'form-control select', style: "width: 100px"
+          = select_tag 'language_id', options_from_collection_for_select(Language.all, 'id', 'pretty_name', @lang_id || Language.find_by_pretty_name("Python").id || Language.first.id), class: 'form-control select', style: "width: 100px"
         .form-group
           = submit_tag 'Submit', class: 'btn btn-success', id: 'live_submit', 
             data: {confirm: "Submitting this source code for task #{@problem.long_name}?"}