diff --git a/engine/function/users.php b/engine/function/users.php
index d6aafad..ebbac8d 100644
--- a/engine/function/users.php
+++ b/engine/function/users.php
@@ -893,36 +893,13 @@ function user_account_id_from_name($id) {
 
 // Add additional premium days to account id
 function user_account_add_premdays($accid, $days) {
-	global $tfs_10_hasPremDays; // Initialized in engine/init.php
 	$accid = (int)$accid;
 	$days = (int)$days;
-
-	if (config('ServerEngine') !== 'OTHIRE') {
-		if ($tfs_10_hasPremDays) {
-			if (mysql_select_single("SHOW COLUMNS from `accounts` WHERE `Field` = 'lastday'") === false) {
-				mysql_update("UPDATE `accounts` SET `premdays` = `premdays`+{$days} WHERE `id`='{$accid}'");
-			} else {
-				mysql_update("	UPDATE `accounts` 
-								SET `premdays` = `premdays`+{$days} 
-								,`lastday` = GREATEST(`lastday`,UNIX_TIMESTAMP(CURDATE())) + ({$days} * 86400)
-								WHERE `id`='{$accid}'
-				");
-			}
-		} else {
-			mysql_update("	UPDATE `accounts` 
-							SET `premium_ends_at` = GREATEST(`premium_ends_at`, UNIX_TIMESTAMP(CURDATE())) + ({$days} * 86400)
-							WHERE `id`='{$accid}';
-			");
-		}
-	} else {
-		$data = mysql_select_single("SELECT `premend` FROM `accounts` WHERE `id`='$accid';");
-		$tmp = $data['premend'];
-		if($tmp == 0)
-			$tmp = time() + ($days * 24 * 60 * 60);
-		else
-			$tmp = $tmp + ($days * 24 * 60 * 60);
-		mysql_update("UPDATE `accounts` SET `premend`='$tmp' WHERE `id`='$accid'");
-	}
+	mysql_update("
+		UPDATE `accounts` 
+		SET `premium_ends_at` = GREATEST(`premium_ends_at`, UNIX_TIMESTAMP(CURDATE())) + ({$days} * 86400)
+		WHERE `id`='{$accid}';
+	");
 }
 
 // Name = char name. Changes from male to female & vice versa.
diff --git a/engine/init.php b/engine/init.php
index c905387..701fc59 100644
--- a/engine/init.php
+++ b/engine/init.php
@@ -50,25 +50,10 @@ if (isset($_SESSION['token'])) {
 }
 Token::generate();
 
-$tfs_10_hasPremDays = true; // https://github.com/otland/forgottenserver/pull/2813
-
 if (user_logged_in() === true) {
-	$session_user_id = getSession('user_id');
-	if ($config['ServerEngine'] !== 'OTHIRE') {
-		if ($config['ServerEngine'] == 'TFS_10') {
-			$hasPremDays = mysql_select_single("SHOW COLUMNS from `accounts` WHERE `Field` = 'premdays'");
-			if ($hasPremDays === false) {
-				$tfs_10_hasPremDays = false;
-				$user_data = user_data($session_user_id, 'id', 'name', 'password', 'email', 'premium_ends_at');
-				$user_data['premdays'] = ($user_data['premium_ends_at'] - time() > 0) ? floor(($user_data['premium_ends_at'] - time()) / 86400) : 0;
-			} else {
-				$user_data = user_data($session_user_id, 'id', 'name', 'password', 'email', 'premdays');
-			}
-		} else {
-			$user_data = user_data($session_user_id, 'id', 'name', 'password', 'email', 'premdays');
-		}
-	} else
-		$user_data = user_data($session_user_id, 'id', 'password', 'email', 'premend');
+	$session_user_id = (int)getSession('user_id');
+	$user_data = user_data($session_user_id, 'id', 'name', 'password', 'email', 'premium_ends_at');
+	$user_data['premdays'] = ($user_data['premium_ends_at'] - time() > 0) ? floor(($user_data['premium_ends_at'] - time()) / 86400) : 0;
 	$user_znote_data = user_znote_account_data($session_user_id, 'ip', 'created', 'points', 'cooldown', 'flag' ,'active_email');
 }
 $errors = array();