diff --git a/cms/envs/bok_choy.auth.json b/cms/envs/bok_choy.auth.json
index 17b46a9b6c..e0b60afbd3 100644
--- a/cms/envs/bok_choy.auth.json
+++ b/cms/envs/bok_choy.auth.json
@@ -26,7 +26,7 @@
         "default": {
             "ENGINE": "django.db.backends.mysql",
             "HOST": "localhost",
-            "NAME": "test",
+            "NAME": "edxtest",
             "PASSWORD": "",
             "PORT": "3306",
             "USER": "root"
diff --git a/lms/djangoapps/verify_student/tests/test_views.py b/lms/djangoapps/verify_student/tests/test_views.py
index 24180fc710..20933bd689 100644
--- a/lms/djangoapps/verify_student/tests/test_views.py
+++ b/lms/djangoapps/verify_student/tests/test_views.py
@@ -140,6 +140,20 @@ class TestCreateOrderView(ModuleStoreTestCase):
         self.assertEquals(response.status_code, 400)
         self.assertIn('This course doesn\'t support verified certificates', response.content)
 
+    @patch.dict(settings.FEATURES, {'AUTOMATIC_VERIFY_STUDENT_IDENTITY_FOR_TESTING': True})
+    def test_create_order_fail_with_get(self):
+        """
+        Test that create_order will not work if wrong http method used
+        """
+        create_order_post_data = {
+            'contribution': 50,
+            'course_id': self.course_id,
+            'face_image': ',',
+            'photo_id_image': ','
+        }
+        response = self.client.get(reverse('verify_student_create_order'), create_order_post_data)
+        self.assertEqual(response.status_code, 405)
+
     @patch.dict(settings.FEATURES, {'AUTOMATIC_VERIFY_STUDENT_IDENTITY_FOR_TESTING': True})
     def test_create_order_success(self):
         """
diff --git a/lms/djangoapps/verify_student/views.py b/lms/djangoapps/verify_student/views.py
index 51969c5d7e..c5bbda25cc 100644
--- a/lms/djangoapps/verify_student/views.py
+++ b/lms/djangoapps/verify_student/views.py
@@ -167,6 +167,7 @@ class VerifiedView(View):
         return render_to_response('verify_student/verified.html', context)
 
 
+@require_POST
 @login_required
 def create_order(request):
     """
diff --git a/lms/envs/bok_choy.auth.json b/lms/envs/bok_choy.auth.json
index 1d244c93e8..8504e8c276 100644
--- a/lms/envs/bok_choy.auth.json
+++ b/lms/envs/bok_choy.auth.json
@@ -26,7 +26,7 @@
         "default": {
             "ENGINE": "django.db.backends.mysql",
             "HOST": "localhost",
-            "NAME": "test",
+            "NAME": "edxtest",
             "PASSWORD": "",
             "PORT": "3306",
             "USER": "root"
diff --git a/lms/static/js/spec/photocapture_spec.js b/lms/static/js/spec/photocapture_spec.js
index bcac881188..14a76bade9 100644
--- a/lms/static/js/spec/photocapture_spec.js
+++ b/lms/static/js/spec/photocapture_spec.js
@@ -4,7 +4,7 @@ define(['backbone', 'jquery', 'js/verify_student/photocapture'],
         describe("Photo Verification", function () {
 
             beforeEach(function () {
-                setFixtures('<div id="order-error" style="display: none;"></div><input type="radio" name="contribution" value="35" id="contribution-35" checked="checked"><input type="radio" id="contribution-other" name="contribution" value=""><input type="text" size="9" name="contribution-other-amt" id="contribution-other-amt" value="30"><img id="face_image" src="src="data:image/png;base64,dummy"><img id="photo_id_image" src="src="data:image/png;base64,dummy">');
+                setFixtures('<div id="order-error" style="display: none;"></div><input type="radio" name="contribution" value="35" id="contribution-35" checked="checked"><input type="radio" id="contribution-other" name="contribution" value=""><input type="text" size="9" name="contribution-other-amt" id="contribution-other-amt" value="30"><img id="face_image" src="src="data:image/png;base64,dummy"><img id="photo_id_image" src="src="data:image/png;base64,dummy"><button id="pay_button">pay button</button>');
             });
 
             it('retake photo', function () {
@@ -27,6 +27,7 @@ define(['backbone', 'jquery', 'js/verify_student/photocapture'],
                 });
                 submitToPaymentProcessing();
                 expect(window.submitForm).toHaveBeenCalled();
+                expect($("#pay_button")).toHaveClass("is-disabled");
             });
 
             it('Error during process', function () {
@@ -36,8 +37,18 @@ define(['backbone', 'jquery', 'js/verify_student/photocapture'],
                 spyOn($, "ajax").andCallFake(function (e) {
                     e.error({});
                 });
+                spyOn($.fn, "addClass").andCallThrough();
+                spyOn($.fn, "removeClass").andCallThrough();
+
                 submitToPaymentProcessing();
                 expect(window.showSubmissionError).toHaveBeenCalled();
+
+                // make sure the button isn't disabled
+                expect($("#pay_button")).not.toHaveClass("is-disabled");
+
+                // but also make sure that it was disabled during the ajax call
+                expect($.fn.addClass).toHaveBeenCalledWith("is-disabled");
+                expect($.fn.removeClass).toHaveBeenCalledWith("is-disabled");
             });
 
         });
diff --git a/lms/static/js/verify_student/photocapture.js b/lms/static/js/verify_student/photocapture.js
index dc31f86386..f1507b0322 100644
--- a/lms/static/js/verify_student/photocapture.js
+++ b/lms/static/js/verify_student/photocapture.js
@@ -69,6 +69,7 @@ function refereshPageMessage() {
 }
 
 var submitToPaymentProcessing = function() {
+  $("#pay_button").addClass('is-disabled');
   var contribution_input = $("input[name='contribution']:checked")
   var contribution = 0;
   if(contribution_input.attr('id') == 'contribution-other') {
@@ -95,6 +96,7 @@ var submitToPaymentProcessing = function() {
       }
     },
     error:function(xhr,status,error) {
+      $("#pay_button").removeClass('is-disabled');
       showSubmissionError()
     }
   });
diff --git a/lms/templates/verify_student/verified.html b/lms/templates/verify_student/verified.html
index d90da34f35..9e59546c8c 100644
--- a/lms/templates/verify_student/verified.html
+++ b/lms/templates/verify_student/verified.html
@@ -12,6 +12,7 @@
 <script type="text/javascript">
 var submitToPaymentProcessing = function(event) {
     event.preventDefault();
+    $("#pay_button").addClass("is-disabled");
     var xhr = $.post(
       "${create_order_url}",
       {
@@ -30,7 +31,9 @@ var submitToPaymentProcessing = function(event) {
     .done(function(data) {
       $("#pay_form").submit();
     })
-    .fail(function(jqXhr,text_status, error_thrown) { alert(jqXhr.responseText); });
+    .fail(function(jqXhr,text_status, error_thrown) {
+      $("#pay_button").removeClass("is-disabled");
+      alert(jqXhr.responseText); });
 }
 $(document).ready(function() {
     $("#pay_button").click(submitToPaymentProcessing);
diff --git a/scripts/reset-test-db.sh b/scripts/reset-test-db.sh
index 42d8d69e8d..4b6634bc47 100755
--- a/scripts/reset-test-db.sh
+++ b/scripts/reset-test-db.sh
@@ -25,7 +25,7 @@
 DB_CACHE_DIR="common/test/db_cache"
 
 # Ensure the test database exists.
-echo "CREATE DATABASE IF NOT EXISTS test;" | mysql -u root
+echo "CREATE DATABASE IF NOT EXISTS edxtest;" | mysql -u root
 
 # Clear out the test database
 ./manage.py lms --settings bok_choy reset_db --traceback --noinput
@@ -34,7 +34,7 @@ echo "CREATE DATABASE IF NOT EXISTS test;" | mysql -u root
 if [[ -f $DB_CACHE_DIR/bok_choy_schema.sql && -f $DB_CACHE_DIR/bok_choy_data.json ]]; then
 
     # Load the schema, then the data (including the migration history)
-    mysql -u root test < $DB_CACHE_DIR/bok_choy_schema.sql
+    mysql -u root edxtest < $DB_CACHE_DIR/bok_choy_schema.sql
     ./manage.py lms --settings bok_choy loaddata $DB_CACHE_DIR/bok_choy_data.json
 
     # Re-run migrations to ensure we are up-to-date
@@ -52,6 +52,6 @@ else
 
     # Dump the schema and data to the cache
     ./manage.py lms --settings bok_choy dumpdata > $DB_CACHE_DIR/bok_choy_data.json
-    mysqldump -u root --no-data --skip-comments --skip-dump-date test > $DB_CACHE_DIR/bok_choy_schema.sql
+    mysqldump -u root --no-data --skip-comments --skip-dump-date edxtest > $DB_CACHE_DIR/bok_choy_schema.sql
 fi