diff --git a/Changelog b/Changelog
index 0e43e52f3..6479887bf 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2017-08-11 DariusIII
+	* Chg: Revert inserting apikey into old behavior
 	* Chg: Change the length of rsstoken (api key)
 	* Chg: Remove duplicate zipfile.php
 	* Chg: Add 2 more files originating from laravel installation(server.php for local dev web server used by laravel)
diff --git a/nntmux/Users.php b/nntmux/Users.php
index b3069ffba..26bb28143 100755
--- a/nntmux/Users.php
+++ b/nntmux/Users.php
@@ -496,7 +496,7 @@ class Users
 	 */
 	public function updateRssKey($uid): int
 	{
-		User::query()->where('id', $uid)->update(['rsstoken' => Password::getRepository()->createNewToken()]);
+		User::query()->where('id', $uid)->update(['rsstoken' => md5(Password::getRepository()->createNewToken())]);
 
 		return self::SUCCESS;
 	}
@@ -810,7 +810,7 @@ class Users
 			sprintf('
 				INSERT INTO users (username, password, email, role, createddate, host, rsstoken,
 					invites, invitedby, userseed, notes)
-				VALUES (%s, %s, LOWER(%s), %d, NOW(), %s, %s, %d, %s, MD5(%s), %s)',
+				VALUES (%s, %s, LOWER(%s), %d, NOW(), %s, MD5(%s), %d, %s, MD5(%s), %s)',
 				$this->pdo->escapeString($userName),
 				$this->pdo->escapeString((string)$password),
 				$this->pdo->escapeString($email),