diff --git a/commands/setPresence.js b/commands/setPresence.js
index e04adba..f52823a 100644
--- a/commands/setPresence.js
+++ b/commands/setPresence.js
@@ -1,3 +1,5 @@
+const setPresence = require("../util/setPresence");
+
 module.exports = {
 	name: 'setpresence', 
 	description: 'Set the presence for the bot',
@@ -20,9 +22,8 @@ module.exports = {
 		}
 		const firstArg = args[0].length + 1;
 		let temp = args.join(" ");
-		let regex = /<prefix>/g
 		let presenceText = temp.slice(firstArg, temp.length)
-		client.user.setActivity(presenceText.replace(regex, globalPrefix), { type: presenceType });
+		setPresence({presenceText: presenceText,presenceType: presenceType, client: client, globalPrefix: globalPrefix});
 		savePresence(presenceType, presenceText);
 		message.channel.send("Updated presence.")
 	}
diff --git a/server.js b/server.js
index 24cb5d0..c3b7958 100644
--- a/server.js
+++ b/server.js
@@ -11,9 +11,7 @@ const {
 	loginMessage,
 	loginChannel,
 	enableLoginMessage,
-	owners,
-	presenceText,
-	presenceType
+	owners
 } = require('./data/config.json');
 
 client.commands = new Discord.Collection();
@@ -32,12 +30,6 @@ client.once('ready', () => {
 	console.clear();
 	updatePresence(client)
 	console.log('Ready!');
-	if(presenceType && presenceText){
-		let regex = /<prefix>/g
-		client.user.setActivity(presenceText.replace(regex, globalPrefix), { type: presenceType });
-	}
-	else 
-		client.user.setActivity(globalPrefix, {type : "WATCHING"});
 	if (enableLoginMessage === true)
 		try{
 		client.channels.cache.get(loginChannel).send(loginMessage)
diff --git a/util/setPresence.js b/util/setPresence.js
new file mode 100644
index 0000000..2b6d03d
--- /dev/null
+++ b/util/setPresence.js
@@ -0,0 +1,11 @@
+const getGuildCount = require("./getGuildCount")
+
+module.exports = function ({presenceText, presenceType, client}) {
+	const {globalPrefix} = require ('../data/config.json')
+	let guildCount = getGuildCount(client)
+	let regex = /<guilds>/g
+	presenceText = presenceText.replace(regex, guildCount)
+	regex = /<prefix>/g
+	presenceText = presenceText.replace(regex, globalPrefix)
+	client.user.setActivity(presenceText, { type: presenceType });
+}
\ No newline at end of file
diff --git a/util/updatePresence.js b/util/updatePresence.js
index c50e95b..0d29a9d 100644
--- a/util/updatePresence.js
+++ b/util/updatePresence.js
@@ -1,4 +1,4 @@
-const getGuildCount = require('./getGuildCount')
+const setPresence = require('./setPresence')
 
 module.exports = function (client) {
 	const updatePresence = require('./updatePresence')
@@ -6,12 +6,9 @@ module.exports = function (client) {
 		presenceText,
 		presenceType
 	} = require('../data/config.json')
-	
-	if(presenceText.includes("<guilds>")){
-		let guildCount = getGuildCount(client)
-		let regex = /<guilds>/g
-		presenceText = presenceText.replace(regex, guildCount)
-		client.user.setActivity(presenceText, { type: presenceType });
+
+	if(presenceText.includes("<guilds>") || presenceText.includes("<prefix>")){
+		setPresence({presenceText: presenceText, presenceType: presenceType, client: client});	
 	}