diff --git a/bin/hardening/10.1.1_set_password_exp_days.sh b/bin/hardening/10.1.1_set_password_exp_days.sh
index 4809258..0c66ec5 100755
--- a/bin/hardening/10.1.1_set_password_exp_days.sh
+++ b/bin/hardening/10.1.1_set_password_exp_days.sh
@@ -16,6 +16,7 @@ HARDENING_LEVEL=3
 PACKAGE='login'
 OPTIONS='PASS_MAX_DAYS=90'
 FILE='/etc/login.defs'
+SHA_FILE='/etc/shadow'
 
 # This function will be called if the script status is on enabled / audit mode
 audit () {
@@ -24,17 +25,21 @@ audit () {
         crit "$PACKAGE is not installed!"
     else
         ok "$PACKAGE is installed"
-        for SSH_OPTION in $OPTIONS; do
-            SSH_PARAM=$(echo $SSH_OPTION | cut -d= -f 1)
-            SSH_VALUE=$(echo $SSH_OPTION | cut -d= -f 2)
-            PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
-            does_pattern_exist_in_file $FILE "$PATTERN"
-            if [ $FNRET = 0 ]; then
-                ok "$PATTERN is present in $FILE"
-            else
-                crit "$PATTERN is not present in $FILE"
-            fi
-        done
+        SSH_PARAM=$(echo $OPTIONS | cut -d= -f 1)
+        SSH_VALUE=$(echo $OPTIONS | cut -d= -f 2)
+        PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
+        does_pattern_exist_in_file $FILE "$PATTERN"
+        if [ $FNRET = 0 ]; then
+			ok "$PATTERN is present in $FILE"
+		else
+			crit "$PATTERN is not present in $FILE"
+		fi
+
+		if [ $(egrep ^[^:]+:[^\!*] $SHA_FILE | awk -F: '$5 > "'$SSH_VALUE'" {print $1}' | wc -l) -gt 0 ]; then
+			crit "Have least user's maxinum password lifttime is greater than $SSH_VALUE day"
+		else
+			ok "All user's maxinum password lifttime is equal or less than $SSH_VALUE day"
+		fi
     fi
 }
 
@@ -47,24 +52,29 @@ apply () {
         crit "$PACKAGE is absent, installing it"
         apt_install $PACKAGE
     fi
-    for SSH_OPTION in $OPTIONS; do
-            SSH_PARAM=$(echo $SSH_OPTION | cut -d= -f 1)
-            SSH_VALUE=$(echo $SSH_OPTION | cut -d= -f 2)
-            PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
-            does_pattern_exist_in_file $FILE "$PATTERN"
-            if [ $FNRET = 0 ]; then
-                ok "$PATTERN is present in $FILE"
-            else
-                warn "$PATTERN is not present in $FILE, adding it"
-                does_pattern_exist_in_file $FILE "^$SSH_PARAM"
-                if [ $FNRET != 0 ]; then
-                    add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
-                else
-                    info "Parameter $SSH_PARAM is present but with the wrong value -- Fixing"
-                    replace_in_file $FILE "^$SSH_PARAM[[:space:]]*.*" "$SSH_PARAM $SSH_VALUE"
-                fi
-            fi
-    done
+	SSH_PARAM=$(echo $OPTIONS | cut -d= -f 1)
+	SSH_VALUE=$(echo $OPTIONS | cut -d= -f 2)
+	PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
+	does_pattern_exist_in_file $FILE "$PATTERN"
+	if [ $FNRET = 0 ]; then
+		ok "$PATTERN is present in $FILE"
+	else
+		warn "$PATTERN is not present in $FILE, adding it"
+		does_pattern_exist_in_file $FILE "^$SSH_PARAM"
+		if [ $FNRET != 0 ]; then
+			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
+		else
+			info "Parameter $SSH_PARAM is present but with the wrong value -- Fixing"
+			replace_in_file $FILE "^$SSH_PARAM[[:space:]]*.*" "$SSH_PARAM $SSH_VALUE"
+		fi
+	fi
+	if [ $(egrep ^[^:]+:[^\!*] $SHA_FILE | awk -F: '$5 > "'$SSH_VALUE'" {print $1}' | wc -l) -gt 0 ]; then
+		warn "Have least user's maxinum password lifttime is greater than $SSH_VALUE day, Fixing"
+		for USERNAME in $(egrep ^[^:]+:[^\!*] $SHA_FILE | awk -F: '$5 > "'$SSH_VALUE'" {print $1}'); 
+		do 
+			chage --maxdays $SSH_VALUE $USERNAME
+		done
+	fi
 }
 
 # This function will check config parameters required
diff --git a/bin/hardening/10.1.6_set_max_password_lifetime.sh b/bin/hardening/10.1.6_set_max_password_lifetime.sh
deleted file mode 100755
index c554fd5..0000000
--- a/bin/hardening/10.1.6_set_max_password_lifetime.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-
-#
-# harbian audit 7/8/9  Hardening
-#
-
-#
-# 10.1.6 Set maximum password lifetime (Scored)
-# Author : Samson wen, Samson <sccxboy@gmail.com>
-#
-
-set -e # One error, it's over
-set -u # One variable unset, it's over
-
-HARDENING_LEVEL=3
-
-#set 60 day
-LIFETIME=60
-FILE='/etc/shadow'
-
-# This function will be called if the script status is on enabled / audit mode
-audit () 
-{
-    if [ $(awk -F: '$5 != "'$LIFETIME'" {print $1}' $FILE | wc -l) -gt 0 ]; then
-        crit "Have least user's maxinum password lifttime is not equal $LIFETIME days"
-        FNRET=1
-    else
-        ok "All user's maxinum password lifttime is $LIFETIME days"
-        FNRET=0
-    fi
-}
-
-# This function will be called if the script status is on enabled mode
-apply () {
-    if [ $FNRET = 0 ]; then
-        ok "All user's maxinum password lifttime is $LIFETIME days"
-    elif [ $FNRET = 1 ]; then
-        info "Set all user's maxinum password lifetime to $LIFETIME"
-        for USERNAME in $(awk -F: '$5 != "'$LIFETIME'" {print $1}' $FILE); 
-        do 
-            chage -M $LIFETIME $USERNAME
-        done
-    fi
-}
-
-# This function will check config parameters required
-check_config() {
-    :
-}
-
-# Source Root Dir Parameter
-if [ -r /etc/default/cis-hardening ]; then
-    . /etc/default/cis-hardening
-fi
-if [ -z "$CIS_ROOT_DIR" ]; then
-     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
-     echo "Cannot source CIS_ROOT_DIR variable, aborting."
-    exit 128
-fi
-
-# Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
-    . $CIS_ROOT_DIR/lib/main.sh
-else
-    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
-    exit 128
-fi