diff --git a/sauce/controllers/submissions.py b/sauce/controllers/submissions.py
index 0e6a84ba..e2aaab82 100644
--- a/sauce/controllers/submissions.py
+++ b/sauce/controllers/submissions.py
@@ -301,7 +301,8 @@ def edit(self, **kwargs):
                             #redirect(url(self.submission.url + '/edit'))
                     elif test:
                         if result:
-                            c.child_args['buttons.submit'] = dict(disabled=False)
+                            #c.child_args['buttons.submit'] = dict(disabled=False)
+                            pass
         
         c.options = self.submission
         
diff --git a/sauce/widgets/submission.py b/sauce/widgets/submission.py
index 33a39c36..d2d30bd5 100644
--- a/sauce/widgets/submission.py
+++ b/sauce/widgets/submission.py
@@ -18,7 +18,7 @@ class SubmitButtonTable(ButtonTable):
         fields = [
                   SubmitButton('test', label_text='Test', default='Test', named_button=True, 
                            help_text=u'Compile and run tests on your source code'), 
-                  SubmitButton('submit', disabled=True, label_text='Submit', default='Submit', named_button=True, 
+                  SubmitButton('submit', disabled=False, label_text='Submit', default='Submit', named_button=True, 
                            help_text=u'Submit your source code for final evaluation'),
                   SubmitButton('reset', label_text='Reset', default='Reset', named_button=True, 
                            help_text=u'Reset this submission'),