diff --git a/lgsm/functions/check_permissions.sh b/lgsm/functions/check_permissions.sh
index 77622c690..584ea4695 100644
--- a/lgsm/functions/check_permissions.sh
+++ b/lgsm/functions/check_permissions.sh
@@ -6,50 +6,37 @@
 # Description: Checks script, files and folders ownership and permissions.
 
 local commandname="CHECK"
-
-# Useful variables
-currentuser="$(whoami)"
-currentgroups="$(groups)"
-scriptfullpath="${rootdir}/${selfname}"
-conclusionpermissionerror="0"
+local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
 
 fn_check_ownership(){
-	# Check script ownership
-	if [ ! -O "${scriptfullpath}" ] && [ ! -G "${scriptfullpath}" ]; then
-		fn_print_fail_nl "Oops ! Ownership issue..."
-		echo "	* Current - ${currentuser} - user or its group(s) - ${currentgroups} - does not own \"${selfname}\""
-		echo "	* To check the owner and allowed groups, run ls -l \"${selfname}\""
-		exit 1
-	fi
-
-	# Check rootdir ownership
-	if [ ! -O "${rootdir}" ] && [ ! -G "${rootdir}" ]; then
-		fn_print_fail_nl "Oops ! Ownership issue..."
-		echo "	* Current - ${currentuser} - user or its group(s) - ${currentgroups} - does not own \"${rootdir}\""
-		echo "	* To check the owner and allowed groups, run ls -dl \"${rootdir}\""
-		exit 1
+	if [ $(find "${rootdir}" -not -user $(whoami)|wc -l) -ne "0" ]; then
+		fn_print_fail_nl "Permissions issues found"
+		fn_script_log_fatal "Permissions issues found"
+		fn_print_infomation_nl "The current user ($(whoami)) does not have ownership of the following files:"
+		fn_script_log_info "The current user ($(whoami)) does not have ownership of the following files:"
+		{
+			echo -e "User\tGroup\tFile\n"
+			find "${rootdir}" -not -user $(whoami) -printf "%u\t\t%g\t%p\n"
+		} | column -s $'\t' -t | tee -a "${scriptlog}"
+		core_exit.sh
 	fi
+}
 
-	# Check functions ownership
-	funownfail="0"
+fn_check_permissions(){
 	if [ -n "${functionsdir}" ]; then
-		while read -r filename
-			do
-				if [ ! -O "${filename}" ] && [ ! -G "${filename}" ]; then
-					funownfail="1"
-					conclusionpermissionerror="1"
-				fi
-		done <<< "$(find "${functionsdir}" -name "*.sh")"
-
-		if [ "${funownfail}" == "1" ]; then
-			fn_print_fail_nl "Oops ! Ownership issue..."
-			echo "	* Current - ${currentuser} - user or its group(s) - ${currentgroups} - does not own all scripts in \"${functionsdir}\""
-			echo "	* To check the owner and allowed groups, run ls -l \"${functionsdir}\""
+		if [ $(find "${functionsdir}" -type f -not -executable|wc -l) -ne "0" ]; then
+			fn_print_fail_nl "Permissions issues found"
+			fn_script_log_fatal "Permissions issues found"
+			fn_print_infomation_nl "The following files are not executable:"
+			fn_script_log_info "The following files are not executable:"
+			{
+				echo -e "File\n"
+				find "${functionsdir}" -type f -not -executable -printf "%p\n"
+			} | column -s $'\t' -t | tee -a "${scriptlog}"
+			core_exit.sh
 		fi
 	fi
-}
 
-fn_check_permissions(){
 	# Check rootdir permissions
 	if [ -n "${rootdir}" ]; then
 		# Get permission numbers on folder under the form 775
@@ -58,42 +45,15 @@ fn_check_permissions(){
 		userrootdirperm="${rootdirperm:0:1}"
 		grouprootdirperm="${rootdirperm:1:1}"
 		if [ "${userrootdirperm}" != "7" ] && [ "${grouprootdirperm}" != "7" ]; then
-			fn_print_fail_nl "Oops ! Permission issue..."
-			echo "	* Current - ${currentuser} - user or its group(s) - ${currentgroups} need full control of \"${rootdir}\""
-			echo "	* You might wanna run : chmod -R 770 \"${rootdir}\""
-			conclusionpermissionerror="1"
+			fn_print_fail_nl "Permissions issues found"
+			fn_script_log_fatal "Permissions issues found"
+			fn_print_infomation_nl "The following directorys does not have the correct permissions:"
+			fn_script_log_info "The following directorys does not have the correct permissions:"
+			ls -l "${rootdir}"
+			core_exit.sh
 		fi
 	fi
-
-	# Check functions permissions
-	funcpermfail="0"
-	if [ -n "${functionsdir}" ]; then
-		while read -r filename
-			do
-				funcperm="$(stat -c %a "${filename}")"
-				userfuncdirperm="${funcperm:0:1}"
-				groupfuncdirperm="${funcperm:1:1}"
-				if [ "${userfuncdirperm}" != "7" ] && [ "${groupfuncdirperm}" != "7" ]; then
-					funcpermfail="1"
-					conclusionpermissionerror="1"
-				fi
-		done <<< "$(find "${functionsdir}" -name "*.sh")"
-
-		if [ "${funcpermfail}" == "1" ]; then
-			fn_print_fail_nl "Oops ! Permission issue..."
-			echo "	* Current - ${currentuser} - user or its group(s) - ${currentgroups} need full control on scripts in \"${functionsdir}\""
-			echo "	* You might wanna run : chmod -R 770 \"${functionsdir}\""
-		fi
-	fi
-}
-
-fn_check_permissions_conclusion(){
-	# Exit if errors found
-	if [ "${conclusionpermissionerror}" == "1" ]; then
-		exit 1
-	fi
 }
 
 fn_check_ownership
-fn_check_permissions
-fn_check_permissions_conclusion
\ No newline at end of file
+fn_check_permissions
\ No newline at end of file