diff --git a/Pages/Page.php b/Pages/Page.php
index 20db7f1ca..7d348b127 100644
--- a/Pages/Page.php
+++ b/Pages/Page.php
@@ -84,6 +84,9 @@ protected function __construct($titleKey = '', $pageDepth = 0)
         $this->smarty->assign('PaymentsEnabled', Configuration::Instance()->GetSectionKey(ConfigSection::CREDITS, ConfigKeys::CREDITS_ALLOW_PURCHASE, new BooleanConverter()));
         $this->smarty->assign('EmailEnabled', Configuration::Instance()->GetKey(ConfigKeys::ENABLE_EMAIL, new BooleanConverter()));
 
+	$this->smarty->assign('checkinAdminOnly', Configuration::Instance()->GetSectionKey(ConfigSection::RESERVATION, ConfigKeys::RESERVATION_CHECKIN_ADMIN_ONLY, new BooleanConverter()));
+	$this->smarty->assign('checkoutAdminOnly', Configuration::Instance()->GetSectionKey(ConfigSection::RESERVATION, ConfigKeys::RESERVATION_CHECKOUT_ADMIN_ONLY, new BooleanConverter()));
+
         $this->smarty->assign('LogoUrl', 'librebooking.png');
         if (file_exists($this->path . 'img/custom-logo.png')) {
             $this->smarty->assign('LogoUrl', 'custom-logo.png');
diff --git a/tpl/Reservation/edit.tpl b/tpl/Reservation/edit.tpl
index 32fb9ee09..e0a4c83ae 100644
--- a/tpl/Reservation/edit.tpl
+++ b/tpl/Reservation/edit.tpl
@@ -71,13 +71,13 @@
 </div>
 
 
-{if $CheckInRequired}
+{if $CheckInRequired && (!checkinAdminOnly || $CanViewAdmin)}
     <button type="button" class="btn btn-warning btnCheckin"><i class="fa fa-sign-in"></i> {translate key=CheckIn}
         <span class="autoReleaseButtonMessage"
               data-autorelease-minutes="{$AutoReleaseMinutes}"> - {translate key=ReleasedIn} <span
                     class="autoReleaseMinutes"></span> {translate key=minutes}</span></button>
 {/if}
-{if $CheckOutRequired}
+{if $CheckOutRequired && (!checkoutAdminOnly || $CanViewAdmin)}
     <button type="button" class="btn btn-warning btnCheckout"><i
                 class="fa fa-sign-out"></i> {translate key=CheckOut}</button>
 {/if}
diff --git a/tpl/Reservation/view.tpl b/tpl/Reservation/view.tpl
index 1b4ac1040..d815c01aa 100644
--- a/tpl/Reservation/view.tpl
+++ b/tpl/Reservation/view.tpl
@@ -255,14 +255,14 @@
                             {/block}
 
                             {block name="submitButtons"}
-                                {if $CheckInRequired}
+                                {if $CheckInRequired && (!checkinAdminOnly || $CanViewAdmin)}
                                     <button type="button" class="btn btn-warning btnCheckin"><i
                                                 class="fa fa-sign-in"></i> {translate key=CheckIn}<span
                                                 class="autoReleaseButtonMessage"
                                                 data-autorelease-minutes="{$AutoReleaseMinutes}"> - {translate key=ReleasedIn}
 										<span class="autoReleaseMinutes"></span> {translate key=minutes}</span></button>
                                 {/if}
-                                {if $CheckOutRequired}
+                                {if $CheckOutRequired && (!checkoutAdminOnly || $CanViewAdmin)}
                                     <button type="button" class="btn btn-warning btnCheckout"><i
                                                 class="fa fa-sign-out"></i> {translate key=CheckOut}</button>
                                 {/if}