diff --git a/packages/server/services/users/classes/users/method/data.js b/packages/server/services/users/classes/users/method/data.js
index c0853b9d..baabbbd6 100644
--- a/packages/server/services/users/classes/users/method/data.js
+++ b/packages/server/services/users/classes/users/method/data.js
@@ -1,5 +1,6 @@
 import { User, UserFollow } from "@db_models"
 
+// REWRITE MEE!!!
 export default async (payload = {}) => {
 	const { user_id, from_user_id, basic } = payload
 
@@ -41,6 +42,8 @@ export default async (payload = {}) => {
 				}
 			})
 		}
+
+		return data
 	} else {
 		data = await User.findOne({
 			_id: user_id,
@@ -62,7 +65,7 @@ export default async (payload = {}) => {
 
 			data.following = !!isFollowed
 		}
-	}
 
-	return data
+		return data
+	}
 }
diff --git a/packages/server/services/users/routes/users/[user_id]/data/get.js b/packages/server/services/users/routes/users/[user_id]/data/get.js
index e94cfd59..ad9ae002 100644
--- a/packages/server/services/users/routes/users/[user_id]/data/get.js
+++ b/packages/server/services/users/routes/users/[user_id]/data/get.js
@@ -8,7 +8,7 @@ export default {
 		const ids = user_id.split(",")
 
 		return await Users.data({
-			user_id: ids.length > 0 ? ids : user_id,
+			user_id: ids.length > 1 ? ids : user_id,
 			from_user_id: req.auth?.session.user_id,
 			basic: req.query?.basic,
 		})