diff --git a/scripts/install b/scripts/install
index 45cb9ed..a81e750 100644
--- a/scripts/install
+++ b/scripts/install
@@ -109,12 +109,9 @@ ynh_script_progression --message="Configuring system user..." --weight=2
 # Create a system user
 ynh_system_user_create --username=$app
 
-if grep -q render /etc/group
-    then
-		# Add user to render group
-		adduser $app render
-    else
-		echo "render group does not exist"
+if [ $(grep -q "^render:" /etc/group) ]; then
+	# Add user to render group
+	adduser $app render
 fi
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 2cc9445..d394fc8 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -48,11 +48,8 @@ if [ -z "$config_path" ]; then
 fi
 
 # If jellyfin doesn't belong to render group, add it
-if [ ! $(grep "jellyfin:x:[0-9]*:render" /etc/group) ]
-then
-    adduser $app render
-else
-	echo "render group does not exist"
+if [ ! $(id -Gn $app | grep -q '\brender\b') ]; then
+	adduser $app render
 fi
 
 # Cleaning legacy permissions