diff --git a/src/etc/inc/plugins.inc.d/rfc2136.inc b/src/etc/inc/plugins.inc.d/rfc2136.inc
index f86ed3c93..6c85f01fd 100644
--- a/src/etc/inc/plugins.inc.d/rfc2136.inc
+++ b/src/etc/inc/plugins.inc.d/rfc2136.inc
@@ -88,7 +88,7 @@ function rfc2136_configure_do($verbose = false, $int = '', $updatehost = '', $fo
 {
     global $config;
 
-    if (!rfc_2136_enabled()) {
+    if (!rfc2136_enabled()) {
         return;
     }
 
diff --git a/src/www/services_dyndns_edit.php b/src/www/services_dyndns_edit.php
index e4a7aa0cc..237bfa616 100644
--- a/src/www/services_dyndns_edit.php
+++ b/src/www/services_dyndns_edit.php
@@ -398,14 +398,14 @@ include("head.inc");
                   <tr>
                     <td>&nbsp;</td>
                     <td>
-                      <input name="Submit" type="submit" class="btn btn-primary" value="<?= gettext("Save") ?>" onclick="enable_change(true)" />
+                      <button name="submit" type="submit" class="btn btn-primary" value="save" onclick="enable_change(true)"><?= gettext('Save') ?></button>
 <?php
                       if (isset($id)): ?>
+                        <button name="force" type="submit" class="btn btn-primary" value="force" onclick="enable_change(true)"><?= gettext('Save and Force Update') ?></button>
                         <input name="id" type="hidden" value="<?= $id ?>" />
-                        <input name="force" type="submit" class="btn btn-primary" value="<?= gettext("Save & Force Update") ?>" onclick="enable_change(true)" />
 <?php
                       endif; ?>
-                        <a href="services_dyndns.php" class="btn btn-default"><?= gettext("Cancel") ?></a>
+                      <a href="services_dyndns.php" class="btn btn-default"><?= gettext('Cancel') ?></a>
                     </td>
                   </tr>
                   <tr>
diff --git a/src/www/services_rfc2136_edit.php b/src/www/services_rfc2136_edit.php
index a872b53dd..6a31467fb 100644
--- a/src/www/services_rfc2136_edit.php
+++ b/src/www/services_rfc2136_edit.php
@@ -247,12 +247,12 @@ include("head.inc");
                   <tr>
                     <td>&nbsp;</td>
                     <td>
-                      <input name="save" type="submit" class="btn btn-primary" value="<?=gettext("Save");?>" onclick="enable_change(true)" />
-                      <input name="force" type="submit" class="btn btn-primary" value="<?=gettext("Save &amp; Force Update");?>" onclick="enable_change(true)" />
-                      <a href="services_rfc2136.php"><input name="Cancel" type="button" class="btn btn-default" value="<?=gettext("Cancel");?>" /></a>
+                      <button name="save" type="submit" class="btn btn-primary" value="save" onclick="enable_change(true)"><?= gettext('Save') ?></button>
                       <?php if (isset($id)): ?>
-                      <input name="id" type="hidden" value="<?=$id;?>" />
+                        <button name="force" type="submit" class="btn btn-primary" value="force" onclick="enable_change(true)"><?= gettext('Save and Force Update') ?></button>
+                        <input name="id" type="hidden" value="<?=$id;?>" />
                       <?php endif; ?>
+                      <a href="services_rfc2136.php" class="btn btn-default"><?= gettext('Cancel') ?></a>
                     </td>
                   </tr>
                   <tr>