diff --git a/groups/group5_cislevel1 b/groups/group5_cislevel1
index a1958a5f..277ec060 100644
--- a/groups/group5_cislevel1
+++ b/groups/group5_cislevel1
@@ -1,4 +1,4 @@
-GROUP_ID[5]='level1'
+GROUP_ID[5]='cislevel1'
 GROUP_NUMBER[5]='5.0'
 GROUP_TITLE[5]='CIS Level 1 **********************************************************'
 GROUP_RUN_BY_DEFAULT[5]='N' # run it when execute_all is called
diff --git a/groups/group6_cislevel2 b/groups/group6_cislevel2
index 369848ba..3d627e3b 100644
--- a/groups/group6_cislevel2
+++ b/groups/group6_cislevel2
@@ -1,4 +1,4 @@
-GROUP_ID[6]='level2'
+GROUP_ID[6]='cislevel2'
 GROUP_NUMBER[6]='6.0'
 GROUP_TITLE[6]='CIS Level 2 **********************************************************'
 GROUP_RUN_BY_DEFAULT[6]='N' # run it when execute_all is called
diff --git a/include/outputs b/include/outputs
index c873d619..f9bbaa04 100644
--- a/include/outputs
+++ b/include/outputs
@@ -75,7 +75,7 @@ textTitle(){
     if [[ "$ITEM_SCORED" == "Scored" ]]; then
       echo -e "\n$BLUE $TITLE_ID $NORMAL $TITLE_TEXT"
     else
-      echo -e "\n$PURPLE $TITLE_ID  $TITLE_TEXT $NORMAL"
+      echo -e "\n$PURPLE $TITLE_ID $TITLE_TEXT $NORMAL"
     fi
   fi
 }
diff --git a/prowler b/prowler
index 19c2c68c..10eeca1b 100755
--- a/prowler
+++ b/prowler
@@ -11,7 +11,7 @@
 #
 # Author: Toni de la Fuente - @ToniBlyx - https://blyx.com/contact
 
-# http://prowler.cloud 
+# http://prowler.cloud
 
 # Prowler - Iron Maiden
 #
@@ -199,7 +199,7 @@ execute_check() {
 # Function to execute all checks in a group
 execute_group() {
 	show_group_title $1
-	# run the checks in the group
+  # run the checks in the group
 	IFS=',' read -ra CHECKS <<< ${GROUP_CHECKS[$1]}
 	for i in ${CHECKS[@]}; do
     execute_check $i
@@ -208,12 +208,14 @@ execute_group() {
 
 # Function to execute group by name
 execute_group_by_id() {
+  if [ "${GROUP_ID[$1]}" == "group1" ]; then
+    genCredReport
+    saveReport
+  fi
+  prowlerBanner
 	for i in "${!GROUP_ID[@]}"; do
 		if [ "${GROUP_ID[$i]}" == "$1" ]; then
 			execute_group $i
-    else
-      textWarn "ERROR! Use a valid group check name (i.e. group1 or extras or forensics-ready)";
-      exit $EXITCODE
 		fi
 	done
 }
@@ -264,12 +266,10 @@ fi
 if [[ $MODE != "csv" ]]; then
   prowlerBanner
 fi
-getWhoami
+
 genCredReport
 saveReport
-
-#callCheck
-
+getWhoami
 execute_all
 
 cleanTemp