diff --git a/plugins/recaptcha/functions.inc b/plugins/recaptcha/functions.inc
index e4bae170b..7f01d4650 100644
--- a/plugins/recaptcha/functions.inc
+++ b/plugins/recaptcha/functions.inc
@@ -619,52 +619,52 @@ function RECAPTCHA_getIP()
  */
 function RECAPTCHA_getFormId($type) {
     switch ($type) {
-        case 'comment': // OK
+        case 'comment':
             $formId = 'commentform';
             break;
 
-        case 'story':   // OK
+        case 'story':
             $formId = 'submitstory';
             break;
 
-        case 'registration':    // OK
+        case 'registration':
             $formId = 'registrationform';
             break;
 
-        case 'loginform':   // OK
+        case 'loginform':
             $formId = 'userloginform';
             break;
 
-        case 'getpassword': // OK
+        case 'getpassword':
             $formId = 'getpasswordform';
             break;
 
-        case 'contact': // OK
+        case 'contact':
             $formId = 'contactuserform';
             break;
 
-        case 'emailstory':  // OK
+        case 'emailstory':
             $formId = 'contactauthorform';
             break;
 
-        case 'forum':
-            $formId = '';
+        case 'links':
+            $formId = 'submitlink';
             break;
 
-        case 'mediagallery':
-            $formId = '';
+        case 'calendar':
+            $formId = 'submit_event_form';
             break;
 
-        case 'rating':
+        case 'forum':
             $formId = '';
             break;
 
-        case 'links':   // OK
-            $formId = 'submitlink';
+        case 'rating':
+            $formId = '';
             break;
 
-        case 'calendar':
-            $formId = 'submit_event_form';
+        case 'mediagallery':
+            $formId = '';
             break;
 
         default:
diff --git a/public_html/layout/modern_curve/comment/commentform.thtml b/public_html/layout/modern_curve/comment/commentform.thtml
index 67dcfb442..3663cbaef 100644
--- a/public_html/layout/modern_curve/comment/commentform.thtml
+++ b/public_html/layout/modern_curve/comment/commentform.thtml
@@ -54,9 +54,15 @@
       <li><input type="submit" name="{nprefix}mode" value="{lang_preview}" class="submit"{xhtml}></li>
       <li>
         <input type="hidden" name="formtype" value="{formtype}"{xhtml}>
-        {save_option}
+{!if allow_save}
+        <button type="submit" name="{nprefix}mode" value="{lang_save}" class="g-recaptcha"{!if invisible_recaptcha}{invisible_recaptcha}{!endif}>{lang_save}</button>
+        <input type="hidden" name="{nprefix}mode" value="{lang_save}"{xhtml}>
+{!endif}
         <input type="submit" value="{lang_cancel}" name="{nprefix}mode"{xhtml}>
-        {delete_option}
+{!if allow_delete}
+        <button type="submit" name="mode" value="{lang_delete}" class="uk-button uk-button-danger g-recaptcha" onclick="return confirm('{confirm_message}');"{!if invisible_recaptcha}{invisible_recaptcha}{!endif}>{lang_delete}</button>
+        <input type="hidden" name="mode" value="{lang_delete}"{xhtml}>
+{!endif}
         {notification}
       </li>
     </ul>
diff --git a/public_html/layout/modern_curve/comment/commentform_advanced.thtml b/public_html/layout/modern_curve/comment/commentform_advanced.thtml
index e775788ff..34584405a 100644
--- a/public_html/layout/modern_curve/comment/commentform_advanced.thtml
+++ b/public_html/layout/modern_curve/comment/commentform_advanced.thtml
@@ -61,9 +61,15 @@
           <li><input type="submit" name="{nprefix}mode" value="{lang_preview}" class="submit"{xhtml}></li>
           <li>
             <input type="hidden" name="formtype" value="{formtype}"{xhtml}>
-            {save_option}
+{!if allow_save}
+            <button type="submit" name="{nprefix}mode" value="{lang_save}" class="g-recaptcha"{!if invisible_recaptcha}{invisible_recaptcha}{!endif}>{lang_save}</button>
+            <input type="hidden" name="{nprefix}mode" value="{lang_save}"{xhtml}>
+{!endif}
             <input type="submit" value="{lang_cancel}" name="{nprefix}mode"{xhtml}>
-            {delete_option}
+{!if allow_delete}
+            <button type="submit" name="mode" value="{lang_delete}" class="uk-button uk-button-danger g-recaptcha" onclick="return confirm('{confirm_message}');"{!if invisible_recaptcha}{invisible_recaptcha}{!endif}>{lang_delete}</button>
+            <input type="hidden" name="mode" value="{lang_delete}"{xhtml}>
+{!endif}
             {notification}
           </li>
         </ul>
diff --git a/public_html/layout/modern_curve/profiles/contactauthorform.thtml b/public_html/layout/modern_curve/profiles/contactauthorform.thtml
index e55c56b6a..b994de232 100644
--- a/public_html/layout/modern_curve/profiles/contactauthorform.thtml
+++ b/public_html/layout/modern_curve/profiles/contactauthorform.thtml
@@ -35,7 +35,7 @@
         <li>
           <input type="hidden" name="sid" value="{story_id}"{xhtml}>
           <input type="hidden" name="what" value="sendstory"{xhtml}>
-          <input type="submit" value="{lang_sendmessage}" onclick="return postconfirm();" onkeypress="return postconfirm();" class="submit"{xhtml}>
+          <button type="submit" value="{lang_sendmessage}" onclick="return postconfirm();" onkeypress="return postconfirm();" class="g-recaptcha"{!if invisible_recaptcha}{invisible_recaptcha}{!endif}>{lang_sendmessage}</button>
         </li>
       </ul>
     </div>
diff --git a/public_html/layout/modern_curve/profiles/contactuserform.thtml b/public_html/layout/modern_curve/profiles/contactuserform.thtml
index c83985243..c28bc6e7b 100644
--- a/public_html/layout/modern_curve/profiles/contactuserform.thtml
+++ b/public_html/layout/modern_curve/profiles/contactuserform.thtml
@@ -30,7 +30,7 @@
       <li>
         <input type="hidden" name="what" value="contact"{xhtml}>
         <input type="hidden" name="uid" value="{uid}"{xhtml}>
-        <input type="submit" value="{lang_submit}" onclick="return postconfirm();" onkeypress="return postconfirm();" class="submit"{xhtml}>
+        <button type="submit" value="{lang_submit}" onclick="return postconfirm();" onkeypress="return postconfirm();" class="g-recaptcha"{!if invisible_recaptcha}{invisible_recaptcha}{!endif}>{lang_submit}</button>
       </li>
     </ul>
   </div>
diff --git a/public_html/layout/modern_curve/submit/submitarticle.thtml b/public_html/layout/modern_curve/submit/submitarticle.thtml
index 3026e1256..916a3dc2d 100644
--- a/public_html/layout/modern_curve/submit/submitarticle.thtml
+++ b/public_html/layout/modern_curve/submit/submitarticle.thtml
@@ -48,7 +48,10 @@
         <input type="hidden" name="uid" value="{story_uid}"{xhtml}>
         <input type="hidden" name="sid" value="{story_sid}"{xhtml}>
         <input type="hidden" name="date" value="{story_date}"{xhtml}>
-        {save_button}
+        {!if allow_save}
+        <button type="submit" value="{lang_save}" class="g-recaptcha"{!if invisible_recaptcha}{invisible_recaptcha}{!endif}>{lang_save}</button>
+        <input type="hidden" name="mode" value="{lang_save}">
+        {!endif}
       </li>
     </ul>
   </div>
diff --git a/public_html/layout/modern_curve/submit/submitarticle_advanced.thtml b/public_html/layout/modern_curve/submit/submitarticle_advanced.thtml
index 21c8f6365..e303f2810 100644
--- a/public_html/layout/modern_curve/submit/submitarticle_advanced.thtml
+++ b/public_html/layout/modern_curve/submit/submitarticle_advanced.thtml
@@ -54,7 +54,10 @@
             <input type="hidden" name="uid" value="{story_uid}"{xhtml}>
             <input type="hidden" name="sid" value="{story_sid}"{xhtml}>
             <input type="hidden" name="date" value="{story_date}"{xhtml}>
-            {save_button}
+            {!if allow_save}
+            <button type="submit" name="mode" value="{lang_save}" class="g-recaptcha"{!if invisible_recaptcha}{invisible_recaptcha}{!endif}>{lang_save}</button>
+            <input type="hidden" name="mode" value="{lang_save}">
+            {!endif}
           </li>
         </ul>
       </div>
diff --git a/public_html/layout/modern_curve/users/getpasswordform.thtml b/public_html/layout/modern_curve/users/getpasswordform.thtml
index 89a4ef7bf..6a192a721 100644
--- a/public_html/layout/modern_curve/users/getpasswordform.thtml
+++ b/public_html/layout/modern_curve/users/getpasswordform.thtml
@@ -20,7 +20,7 @@
       <ul class="submit">
         <li>
           <input type="hidden" name="mode" value="emailpasswd"{xhtml}>
-          <input type="submit" value="{lang_emailpassword}" class="submit"{xhtml}>
+          <button type="submit" value="{lang_emailpassword}" class="g-recaptcha"{!if invisible_recaptcha}{invisible_recaptcha}{!endif}>{lang_emailpassword}</button>
         </li>
       </ul>
     </div>
diff --git a/public_html/layout/modern_curve/users/loginform.thtml b/public_html/layout/modern_curve/users/loginform.thtml
index 99fc9279a..1efaa78fe 100644
--- a/public_html/layout/modern_curve/users/loginform.thtml
+++ b/public_html/layout/modern_curve/users/loginform.thtml
@@ -20,8 +20,8 @@
           {!if captcha} 
           {captcha}
           <div style="clear:both"></div>
-          {!endif} 
-          <input type="submit" value="{lang_login}" class="submit"{xhtml}>
+          {!endif}
+          <button type="submit" value="{lang_login}" class="g-recaptcha"{!if invisible_recaptcha}{invisible_recaptcha}{!endif}>{lang_login}</button>
           <div style="clear:both"></div>
 
         <ul class="navi">
diff --git a/public_html/layout/modern_curve/users/registrationform.thtml b/public_html/layout/modern_curve/users/registrationform.thtml
index 289ab3f30..e320236c6 100644
--- a/public_html/layout/modern_curve/users/registrationform.thtml
+++ b/public_html/layout/modern_curve/users/registrationform.thtml
@@ -24,7 +24,7 @@
       <ul class="submit">
         <li>
           <input type="hidden" name="mode" value="create"{xhtml}>
-          <input type="submit" value="{lang_register}" class="submit"{xhtml}>
+          <button type="submit" value="{lang_register}" class="g-recaptcha"{!if invisible_recaptcha}{invisible_recaptcha}{!endif}>{lang_register}</button>
         </li>
       </ul>
     </fieldset>