diff --git a/customize.dist/src/less2/pages/page-register.less b/customize.dist/src/less2/pages/page-register.less
index 314ad7236..cc319a0e4 100644
--- a/customize.dist/src/less2/pages/page-register.less
+++ b/customize.dist/src/less2/pages/page-register.less
@@ -2,9 +2,11 @@
 @import (reference) "../include/colortheme-all.less";
 @import (reference) "../include/alertify.less";
 @import (reference) "../include/checkmark.less";
+@import (reference) "../include/forms.less";
 
 &.cp-page-register {
     .infopages_main();
+    .forms_main();
 
     .alertify_main();
     .checkmark_main(20px);
diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index 601375b96..d406eccaf 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -647,9 +647,6 @@ define([
         var $ok = $(ok).click(function (ev) { close(true, ev); });
         var $cancel = $(cancel).click(function (ev) { close(false, ev); });
 
-        if (opt.cancelClass) { $cancel.addClass(opt.cancelClass); }
-        if (opt.okClass) { $ok.addClass(opt.okClass); }
-
         listener = listenForKeys(function () {
             $ok.click();
         }, function () {
diff --git a/www/register/main.js b/www/register/main.js
index 289c40df5..e2c30ea64 100644
--- a/www/register/main.js
+++ b/www/register/main.js
@@ -118,7 +118,7 @@ define([
 /*  If we're certain that we aren't using these "*Class" APIs
     anywhere else then we can deprecate them and make this a
     custom modal in common-interface (or here).  */
-                cancelClass: 'btn.btn-primary',
+                cancelClass: 'btn.btn-safe',
                 okClass: 'btn.btn-danger',
                 reverseOrder: true,
                 done: function ($dialog) {