diff --git a/php/modules/Album.php b/php/modules/Album.php
index d3c2fe2..1b4a9ab 100644
--- a/php/modules/Album.php
+++ b/php/modules/Album.php
@@ -59,22 +59,22 @@ class Album extends Module {
 		switch($this->albumIDs) {
 
 			case 'f':	$return['public'] = false;
-						$query = "SELECT id, title, tags, sysdate, public, star, album, thumbUrl FROM lychee_photos WHERE star = 1 " . $this->settings['sorting'];
+						$query = "SELECT id, title, tags, public, star, album, thumbUrl FROM lychee_photos WHERE star = 1 " . $this->settings['sorting'];
 						break;
 
 			case 's':	$return['public'] = false;
-						$query = "SELECT id, title, tags, sysdate, public, star, album, thumbUrl FROM lychee_photos WHERE public = 1 " . $this->settings['sorting'];
+						$query = "SELECT id, title, tags, public, star, album, thumbUrl FROM lychee_photos WHERE public = 1 " . $this->settings['sorting'];
 						break;
 
 			case '0':	$return['public'] = false;
-						$query = "SELECT id, title, tags, sysdate, public, star, album, thumbUrl FROM lychee_photos WHERE album = 0 " . $this->settings['sorting'];
+						$query = "SELECT id, title, tags, public, star, album, thumbUrl FROM lychee_photos WHERE album = 0 " . $this->settings['sorting'];
 						break;
 
 			default:	$albums = $this->database->query("SELECT * FROM lychee_albums WHERE id = '$this->albumIDs' LIMIT 1;");
 						$return = $albums->fetch_assoc();
 						$return['sysdate']		= date('d M. Y', strtotime($return['sysdate']));
 						$return['password']		= ($return['password']=='' ? false : true);
-						$query = "SELECT id, title, tags, sysdate, public, star, album, thumbUrl FROM lychee_photos WHERE album = '$this->albumIDs' " . $this->settings['sorting'];
+						$query = "SELECT id, title, tags, public, star, album, thumbUrl FROM lychee_photos WHERE album = '$this->albumIDs' " . $this->settings['sorting'];
 						break;
 
 		}
@@ -85,7 +85,7 @@ class Album extends Module {
 		while($photo = $photos->fetch_assoc()) {
 
 			# Parse
-			$photo['sysdate']			= date('d F Y', strtotime($photo['sysdate']));
+			$photo['sysdate']			= date('d F Y', substr($photo['id'], 0, -4));
 			$photo['previousPhoto']		= $previousPhotoID;
 			$photo['nextPhoto']		= '';
 
diff --git a/php/modules/Photo.php b/php/modules/Photo.php
index 541b222..e6c8097 100755
--- a/php/modules/Photo.php
+++ b/php/modules/Photo.php
@@ -33,7 +33,7 @@ class Photo extends Module {
 		$photo	= $photos->fetch_assoc();
 
 		# Parse photo
-		$photo['sysdate'] = date('d M. Y', strtotime($photo['sysdate']));
+		$photo['sysdate'] = date('d M. Y', substr($photo['id'], 0, -4));
 		if (strlen($photo['takedate'])>0) $photo['takedate'] = date('d M. Y', strtotime($photo['takedate']));
 
 		if ($albumID!='false') {