diff --git a/functions/EmuScripts/emuDeckPCSX2.sh b/functions/EmuScripts/emuDeckPCSX2.sh
index 375e39ba..02d5d3a2 100644
--- a/functions/EmuScripts/emuDeckPCSX2.sh
+++ b/functions/EmuScripts/emuDeckPCSX2.sh
@@ -115,10 +115,6 @@ PCSX2_finalize(){
 	echo "NYI"
 }
 
-PCSX2_retroAchievementsSetLogin(){
-	rat=$(cat "$HOME/.config/EmuDeck/.rat")
-	changeLine 'Token = ' 'Token = "'"${rat}"'"' "$PCSX2_configFile" &>/dev/null && echo 'RetroAchievements Token set.' || echo 'RetroAchievements Token not set.'
-}
 
 PCSX2_addSteamInputProfile(){
 	setMSG "Adding $PCSX2_emuName Steam Input Profile."
diff --git a/functions/EmuScripts/emuDeckPCSX2QT.sh b/functions/EmuScripts/emuDeckPCSX2QT.sh
index 51e476dc..8800eb57 100644
--- a/functions/EmuScripts/emuDeckPCSX2QT.sh
+++ b/functions/EmuScripts/emuDeckPCSX2QT.sh
@@ -161,4 +161,12 @@ PCSX2QT_resetConfig(){
 PCSX2QT_addSteamInputProfile(){
 	setMSG "Adding $PCSX2QT_emuName Steam Input Profile."
 	rsync -r "$EMUDECKGIT/configs/steam-input/PCSX2QT_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/"
+}
+
+
+PCSX2QT_retroAchievementsSetLogin(){
+	rat=$(cat "$HOME/.config/EmuDeck/.rat")
+	rau=$(cat "$HOME/.config/EmuDeck/.rau")
+	changeLine 'Token = ' 'Token = "'"${rat}"'"' "$PCSX2QT_configFile" &>/dev/null && echo 'RetroAchievements Token set.' || echo 'RetroAchievements Token not set.'
+	changeLine 'Username = ' 'Username = "'"${rau}"'"' "$PCSX2QT_configFile" &>/dev/null && echo 'RetroAchievements User set.' || echo 'RetroAchievements User not set.'
 }
\ No newline at end of file
diff --git a/setup.sh b/setup.sh
index 78092aa9..8ce78174 100644
--- a/setup.sh
+++ b/setup.sh
@@ -599,27 +599,18 @@ fi
 #RetroAchievments
 if [ "$doSetupRA" == "true" ]; then
 	RetroArch_retroAchievementsSetLogin
-	if [ "$doRASignIn" == "true" ]; then
-		#RetroArch_retroAchievementsPromptLogin
-		#RetroArch_retroAchievementsSetLogin
-		RetroArch_retroAchievementsOn
-	fi
-	
-	if [ "$doRAEnable" == "true" ]; then
-		RetroArch_retroAchievementsOn
-	fi
-	
 	if [ "$achievementsHardcore" == "true" ]; then
 		RetroArch_retroAchievementsHardCoreOn
 	else
 		RetroArch_retroAchievementsHardCoreOff
 	fi
 fi
-
-if [ "$doRASignIn" == "true" ]; then
-	DuckStation_retroAchievementsSetLogin
-	PCSX2_retroAchievementsSetLogin
-fi
+#if [ "$doSetupDuck" == "true" ]; then
+#	DuckStation_retroAchievementsSetLogin
+#fi
+#if [ "$doSetupPCSX2QT" == "true" ]; then
+#	PCSX2_retroAchievementsSetLogin
+#fi
 
 #Sudo Required!
 if [ -n "$PASSWD" ]; then