diff --git a/web/skins/classic/js/base.js b/web/skins/classic/js/base.js
index 41bec4ed9..87220a183 100644
--- a/web/skins/classic/js/base.js
+++ b/web/skins/classic/js/base.js
@@ -65,7 +65,7 @@ var popupSizes = {
   'storage':      {'width': 600, 'height': 405},
   'timeline':     {'width': 760, 'height': 540},
   'user':         {'width': 460, 'height': 720},
-  'version':      {'width': 360, 'height': 185},
+  'version':      {'width': 360, 'height': 210},
   'video':        {'width': 420, 'height': 360},
   'videoview':    {'addWidth': 48, 'addHeight': 80},
   'watch':        {'addWidth': 96, 'minWidth': 420, 'addHeight': 384},
diff --git a/web/skins/classic/views/version.php b/web/skins/classic/views/version.php
index 70590eb2b..a7562f355 100644
--- a/web/skins/classic/views/version.php
+++ b/web/skins/classic/views/version.php
@@ -18,29 +18,28 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-if ( !canEdit( 'System' ) )
-{
-    $view = "error";
-    return;
+if ( !canView('System') ) {
+  $view = 'error';
+  return;
 }
+
 $options = array(
-    "go" => translate('GoToZoneMinder')
+  'go' => translate('GoToZoneMinder')
 );
 
-if ( verNum( ZM_DYN_CURR_VERSION ) != verNum( ZM_DYN_LAST_VERSION ) )
-{
-    $options = array_merge( $options, array(
-        "ignore" => translate('VersionIgnore'),
-        "hour"   => translate('VersionRemindHour'),
-        "day"    => translate('VersionRemindDay'),
-        "week"   => translate('VersionRemindWeek'),
-        "never"  => translate('VersionRemindNever')
-    ) );
+if ( verNum(ZM_DYN_CURR_VERSION) != verNum(ZM_DYN_LAST_VERSION) and canEdit('System') ) {
+  $options = array_merge( $options, array(
+    'ignore' => translate('VersionIgnore'),
+    'hour'   => translate('VersionRemindHour'),
+    'day'    => translate('VersionRemindDay'),
+    'week'   => translate('VersionRemindWeek'),
+    'never'  => translate('VersionRemindNever')
+  ) );
 }
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, translate('Version') );
+xhtmlHeaders(__FILE__, translate('Version'));
 ?>
 <body>
   <div id="page">
@@ -49,29 +48,20 @@ xhtmlHeaders(__FILE__, translate('Version') );
     </div>
     <div id="content">
 <?php
-if ( ZM_DYN_DB_VERSION && (ZM_DYN_DB_VERSION != ZM_VERSION) )
-{
+if ( ZM_DYN_DB_VERSION && (ZM_DYN_DB_VERSION != ZM_VERSION) ) {
 ?>
       <p class="errorText"><?php echo sprintf( $CLANG['VersionMismatch'], ZM_VERSION, ZM_DYN_DB_VERSION ) ?></p>
       <p><?php echo translate('RunLocalUpdate') ?></p>
       <div id="contentButtons">
-        <input type="button" value="<?php echo translate('Close') ?>" data-on-click="closeWindow"/>
-      </div>
 <?php
-}
-elseif ( verNum( ZM_DYN_LAST_VERSION ) <= verNum( ZM_VERSION ) )
-{
+} else if ( verNum( ZM_DYN_LAST_VERSION ) <= verNum( ZM_VERSION ) ) {
 ?>
-      <p><?php echo sprintf( $CLANG['RunningRecentVer'], ZM_VERSION ) ?></p>
+      <p><?php echo sprintf($CLANG['RunningRecentVer'], ZM_VERSION) ?></p>
       <p><?php echo translate('UpdateNotNecessary') ?></p>
-      <p><input type="button" value="<?php echo translate('GoToZoneMinder') ?>" data-on-click="zmWindow"/></p>
       <div id="contentButtons">
-        <input type="button" value="<?php echo translate('Close') ?>" data-on-click="closeWindow"/>
-      </div>
+      <button type="button" data-on-click="zmWindow"><?php echo translate('GoToZoneMinder') ?></button>
 <?php
-}
-else
-{
+} else {
 ?>
       <form name="contentForm" id="contentForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
         <input type="hidden" name="view" value="none"/>
@@ -80,13 +70,17 @@ else
         <p><?php echo sprintf( $CLANG['LatestRelease'], ZM_DYN_LAST_VERSION, ZM_VERSION ) ?></p>
         <p><?php echo buildSelect( "option", $options ); ?></p>
         <div id="contentButtons">
-          <input type="submit" value="<?php echo translate('Apply') ?>" data-on-click-this="submitForm"/>
-          <input type="button" value="<?php echo translate('Close') ?>" data-on-click="closeWindow"/>
-        </div>
-      </form>
 <?php
+  if ( canEdit('System') ) {
+?>
+          <button type="submit" data-on-click-this="submitForm" value="Apply"><?php echo translate('Apply') ?></button>
+<?php
+  }
 }
 ?>
+          <button type="button" data-on-click="closeWindow"><?php echo translate('Close') ?></button>
+        </div>
+      </form>
     </div>
   </div>
 </body>
