diff --git a/bin/check_password_expiration.pl b/bin/check_password_expiration.pl
index fd2c15ca894b3eb63b94abb56be4145e8224d9a4..d24df643e314e0f203ab0dfd7d89a4a85d6d0d57 100755
--- a/bin/check_password_expiration.pl
+++ b/bin/check_password_expiration.pl
@@ -578,23 +578,9 @@ if ( $results->is_error() ) {
                     my $date_days = $pmaxage_d - ( ( $date_now->local_rd_values )[0] - ( $pass_date->local_rd_values )[0] );
                     if ( $date_days > 0 ) {
                         metaprint( 'info', "'$uid': Accound validity is positiv ($date_days)." );
-                        if ( $date_days == 30 ) {
+                        if ( ( $date_days == 30 ) || ( $date_days == 25 ) || ( $date_days == 20 ) ) {
                             send_email_template( $uid, $email, 'EXPIRATION', $date_days );
-                        } elsif ( $date_days == 20 ) {
-                            send_email_template( $uid, $email, 'EXPIRATION', $date_days );
-                        } elsif ( $date_days == 10 ) {
-                            send_email_template( $uid, $email, 'EXPIRATION', $date_days );
-                        } elsif ( $date_days == 7 ) {
-                            send_email_template( $uid, $email, 'EXPIRATION', $date_days );
-                        } elsif ( $date_days == 5 ) {
-                            send_email_template( $uid, $email, 'EXPIRATION', $date_days );
-                        } elsif ( $date_days == 3 ) {
-                            send_email_template( $uid, $email, 'EXPIRATION', $date_days );
-                        } elsif ( $date_days == 2 ) {
-                            send_email_template( $uid, $email, 'EXPIRATION', $date_days );
-                        } elsif ( $date_days == 1 ) {
-                            send_email_template( $uid, $email, 'EXPIRATION', $date_days );
-                        } elsif ( $date_days == 0 ) {
+                        } elsif ( $date_days <= 10 ) {
                             send_email_template( $uid, $email, 'EXPIRATION', $date_days );
                         }
                     } elsif ( $date_days == 0 ) {