diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 5f57b027bb6..5305be97577 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -1276,6 +1276,7 @@ var/global/BSACooldown = 0
 					alert("This key is already on the whitelist!", null, null, null, null, null)
 					return
 			alien_whitelist += "[M.ckey] - Tajaran"
+			usr << "[M.ckey] added to Tajaran whitelist."
 		else
 			alert("You cannot perform this action. You must be of a higher administrative rank!")
 			return
@@ -1288,6 +1289,7 @@ var/global/BSACooldown = 0
 					alert("This key is already on the whitelist!", null, null, null, null, null)
 					return
 			alien_whitelist += "[M.ckey] - Soghun"
+			usr << "[M.ckey] added to Soghun whitelist."
 		else
 			alert("You cannot perform this action. You must be of a higher administrative rank!")
 			return
diff --git a/config/alienwhitelist.txt b/config/alienwhitelist.txt
index e69de29bb2d..f9386c770fe 100644
--- a/config/alienwhitelist.txt
+++ b/config/alienwhitelist.txt
@@ -0,0 +1,6 @@
+rawrtaicho - Tajaran
+forsamori - Tajaran
+jaffakaik - Tajaran
+jaffakaik - Soghun
+philphil123 - Tajaran
+philphil123 - Soghun
\ No newline at end of file
diff --git a/html/changelog.html b/html/changelog.html
index 0661b1565d5..c37635a7a9a 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -36,7 +36,16 @@ Header Section
 			</td>
 	</tr>
 </table>
-
+<b>Baystation 12 Credit List</b>
+<table align='center' class="top">
+	<tr>
+		<td valign='top'>
+			<font size='2'><b>Code:</b> Abi79, Aryn, Cael_Aislinn, Chinsky, cib, CompactNinja, DopeGhoti, Erthilo, Hawk_v3, Head, Ispil, Lexus Langg, Melonstorm, Master_of_Stuff, Miniature, Mloc, SkyMarshal, Spectre, Strumpetplaya, Sunfall, Tastyfish, Uristqwerty<br></font>
+			<font size='2'><b>Sprites:</b> Apple_Master, Arcalane, Chinsky, CompactNinja, Deus Dactyl, Erthilo, Flashkirby, Miniature<br></font>
+			<font size='2'><b>Thanks To:</b> /tg/ station devs, Goonstation devs, and the original Spacestation 13 devs.</font>
+		</td>
+	</tr>
+</table>
 <!-- 
 Changelog Section 
 -->
@@ -91,8 +100,7 @@ should be listed in the changelog upon commit though. Thanks. -->
 	<h3 class="author">Erthilo updated:</h3>
 	<ul class="changes bgimages16">
 		<li class="rscadd">You can now right-click pick up items and open/close closets items. This means cyborgs can now open/close closets with a bit of fiddling!</li>
-		<li class="rscadd">Added confirmation pop-up for character slot deletion.</li>
->>>>>>> ebc2b0ed1f7d59caf31b582fd31c950bbde35f8f
+		<li class="rscadd">Added confirmation pop-up for character slot deletion.</li>
 	</ul>
 </div>