diff --git a/lib/log/owncloud.php b/lib/log/owncloud.php
index 20df52c27b..7a11a58833 100644
--- a/lib/log/owncloud.php
+++ b/lib/log/owncloud.php
@@ -49,7 +49,8 @@ class OC_Log_Owncloud {
 	public static function write($app, $message, $level) {
 		$minLevel=min(OC_Config::getValue( "loglevel", OC_Log::WARN ), OC_Log::ERROR);
 		if($level>=$minLevel) {
-			$entry=array('app'=>$app, 'message'=>$message, 'level'=>$level, 'time'=>time());
+			$time = date("F d, Y H:i:s", time());
+			$entry=array('app'=>$app, 'message'=>$message, 'level'=>$level, 'time'=> $time);
 			$handle = @fopen(self::$logFile, 'a');
 			if ($handle) {
 				fwrite($handle, json_encode($entry)."\n");
diff --git a/settings/js/log.js b/settings/js/log.js
index 81117f9e82..84f6d1aa5f 100644
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -55,7 +55,11 @@ OC.Log={
 			row.append(messageTd);
 
 			var timeTd=$('<td/>');
-			timeTd.text(formatDate(entry.time*1000));
+			if(isNaN(entry.time)){
+				timeTd.text(entry.time);
+			} else {
+				timeTd.text(formatDate(entry.time*1000));
+			}
 			row.append(timeTd);
 			$('#log').append(row);
 		}
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index fdaba95ac1..182168ce9e 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -214,7 +214,11 @@ endfor;?>
 				<?php p($entry->message);?>
 			</td>
 			<td>
-				<?php p(OC_Util::formatDate($entry->time));?>
+				<?php if(is_int($entry->time)){
+					p(OC_Util::formatDate($entry->time)); 
+				} else {
+					p($entry->time);
+				}?>
 			</td>
 		</tr>
 		<?php endforeach;?>