diff --git a/code/WorkInProgress/Cael_Aislinn/Economy/Accounts.dm b/code/WorkInProgress/Cael_Aislinn/Economy/Accounts.dm
index a556b3b7563..a786e84872f 100644
--- a/code/WorkInProgress/Cael_Aislinn/Economy/Accounts.dm
+++ b/code/WorkInProgress/Cael_Aislinn/Economy/Accounts.dm
@@ -334,6 +334,13 @@ var/global/list/all_money_accounts = list()
 			if( D.security_level <= security_level_passed && (!D.security_level || D.remote_access_pin == attempt_pin_number) )
 				return D
 
+/obj/machinery/account_database/proc/attempt_account_access_nosec(var/attempt_account_number)
+	if(!activated)
+		return 0
+	for(var/datum/money_account/D in all_money_accounts)
+		if(D.account_number == attempt_account_number)
+			return D
+
 /obj/machinery/account_database/proc/get_account(var/account_number)
 	for(var/datum/money_account/D in all_money_accounts)
 		if(D.account_number == account_number)
diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm
index e4470729d1d..d2d93afba2c 100644
--- a/code/game/machinery/slotmachine.dm
+++ b/code/game/machinery/slotmachine.dm
@@ -9,29 +9,14 @@
 	var/money = 25000
 	var/plays = 0
 	var/working = 0
-	var/obj/item/weapon/card/id/scan = null
-
-	attackby(var/obj/item/I as obj, user as mob)
-		if(istype(I, /obj/item/weapon/card/id))
-			if(src.scan)
-				user << "\red There is a card already in the slot machine."
-			else
-				user << "\blue You insert your ID card."
-				usr.drop_item()
-				I.loc = src
-				src.scan = I
-		else src.attack_hand(user)
-		return
+	var/balance=0
 
 	attack_hand(var/mob/user as mob)
+		if(user.mind)
+			if(user.mind.initial_account)
+				balance = user.mind.initial_account.money
 		user.machine = src
-		if (!src.scan)
-			var/dat = {"<B>Slot Machine</B><BR>
-			<HR><BR>
-			<B>Please insert card!</B><BR>"}
-			user << browse(dat, "window=slotmachine;size=450x500")
-			onclose(user, "slotmachine")
-		else if (src.working)
+		if (src.working)
 			var/dat = {"<B>Slot Machine</B><BR>
 			<HR><BR>
 			<B>Please wait!</B><BR>"}
@@ -42,12 +27,10 @@
 			<HR><BR>
 			Five credits to play!<BR>
 			<B>Prize Money Available:</B> [src.money]<BR>
-			<B>Your Card:</B> [src.scan]<BR>
-			<B>Credits Remaining:</B> [src.scan.money]<BR>
+			<B>Credits Remaining:</B> [balance]<BR>
 			[src.plays] players have tried their luck today!<BR>
 			<HR><BR>
-			<A href='?src=\ref[src];ops=1'>Play!<BR>
-			<A href='?src=\ref[src];ops=2'>Eject card"}
+			<A href='?src=\ref[src];ops=1'>Play!<BR>"}
 			user << browse(dat, "window=slotmachine;size=400x500")
 			onclose(user, "slotmachine")
 
@@ -58,10 +41,10 @@
 /*				if (src.working == 1)
 					usr << "\red You need to wait until the machine stops spinning!"
 					return */
-				if (src.scan.money < 5)
+				if (balance < 5)
 					usr << "\red Insufficient money to play!"
 					return
-				src.scan.money -= 5
+				usr.mind.initial_account.money -= 5
 				src.money += 5
 				src.plays += 1
 				src.working = 1
@@ -72,32 +55,27 @@
 					if (roll == 1)
 						for(var/mob/O in hearers(src, null))
 							O.show_message(text("<b>[]</b> says, 'JACKPOT! You win [src.money]!'", src), 1)
-						command_alert("Congratulations [src.scan.registered_name] on winning the Jackpot!", "Jackpot Winner")
-						src.scan.money += src.money
+						command_alert("Congratulations [usr.name] on winning the Jackpot!", "Jackpot Winner")
+						usr.mind.initial_account.money += src.money
 						src.money = 0
 					else if (roll > 1 && roll <= 10)
 						for(var/mob/O in hearers(src, null))
 							O.show_message(text("<b>[]</b> says, 'Big Winner! You win five thousand credits!'", src), 1)
-						src.scan.money += 5000
+						usr.mind.initial_account.money += 5000
 						src.money -= 5000
 					else if (roll > 10 && roll <= 100)
 						for(var/mob/O in hearers(src, null))
 							O.show_message(text("<b>[]</b> says, 'Winner! You win five hundred credits!'", src), 1)
-						src.scan.money += 500
+						usr.mind.initial_account.money += 500
 						src.money -= 500
 					else if (roll > 100 && roll <= 1000)
 						usr << "\blue You win a free game!"
-						src.scan.money += 5
+						usr.mind.initial_account.money += 5
 						src.money -= 5
 					else
 						usr << "\red No luck!"
 					src.working = 0
 					src.icon_state = "slots-off"
-			if(operation == 2) // Eject Card
-				src.scan.loc = src.loc
-				src.scan = null
-				for(var/mob/O in hearers(src, null))
-					O.show_message(text("<b>[]</b> says, 'Thank you for playing!'", src), 1)
 		src.add_fingerprint(usr)
 		src.updateUsrDialog()
-		return
\ No newline at end of file
+		return
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index 3bbc01e3686..8420290efb8 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -190,8 +190,7 @@
 		var/obj/item/weapon/card/id/C = I
 		visible_message("<span class='info'>[usr] swipes a card through [src].</span>")
 		if(linked_account)
-			var/attempt_pin = input("Enter pin code", "Vendor transaction") as num
-			var/datum/money_account/D = linked_db.attempt_account_access(C.associated_account_number, attempt_pin, 2)
+			var/datum/money_account/D = linked_db.attempt_account_access_nosec(C.associated_account_number)
 			if(D)
 				var/transaction_amount = currently_vending.price
 				if(transaction_amount <= D.money)