diff --git a/settings/admin.php b/settings/admin.php
index 8369ee64e0..bf8e03c13c 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -18,6 +18,8 @@ $forms=OC_App::getForms('admin');
 $htaccessworking=OC_Util::ishtaccessworking();
 
 $entries=OC_Log_Owncloud::getEntries(3);
+$entriesremain=(count(OC_Log_Owncloud::getEntries(4)) > 3)?true:false;
+
 function compareEntries($a,$b){
 	return $b->time - $a->time;
 }
@@ -25,6 +27,7 @@ usort($entries, 'compareEntries');
 
 $tmpl->assign('loglevel',OC_Config::getValue( "loglevel", 2 ));
 $tmpl->assign('entries',$entries);
+$tmpl->assign('entriesremain', $entriesremain);
 $tmpl->assign('htaccessworking',$htaccessworking);
 $tmpl->assign('forms',array());
 foreach($forms as $form){
diff --git a/settings/ajax/getlog.php b/settings/ajax/getlog.php
index d9e80de37b..d5af22ac33 100644
--- a/settings/ajax/getlog.php
+++ b/settings/ajax/getlog.php
@@ -14,4 +14,4 @@ $count=(isset($_GET['count']))?$_GET['count']:50;
 $offset=(isset($_GET['offset']))?$_GET['offset']:0;
 
 $entries=OC_Log_Owncloud::getEntries($count,$offset);
-OC_JSON::success(array("data" => OC_Util::sanitizeHTML($entries)));
+OC_JSON::success(array("data" => OC_Util::sanitizeHTML($entries), "remain"=>(count(OC_Log_Owncloud::getEntries(1,$offset + $offset)) != 0)?true:false));
diff --git a/settings/js/log.js b/settings/js/log.js
index fe2e92f7a8..04a7bf8b28 100644
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -23,6 +23,9 @@ OC.Log={
 			if(result.status=='success'){
 				OC.Log.addEntries(result.data);
 				$('html, body').animate({scrollTop: $(document).height()}, 800);
+				if(!result.remain){
+					$('#moreLog').css('display', 'none');
+				}
 			}
 		});
 	},
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 033cd1a164..60b9732d7f 100755
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -52,7 +52,10 @@ if(!$_['htaccessworking']) {
 		</tr>
 	<?php endforeach;?>
 </table>
+<?php if($_['entriesremain']): ?>
 <input id='moreLog' type='button' value='<?php echo $l->t('More');?>...'></input>
+<?php endif; ?>
+
 </fieldset>