diff --git a/hooks/centos4/35-setup-users b/hooks/centos4/35-setup-users
index 76973f4..1df253c 100755
--- a/hooks/centos4/35-setup-users
+++ b/hooks/centos4/35-setup-users
@@ -27,7 +27,6 @@ die "Prefix must be a directory" unless ( -d $prefix );
 #
 exit unless ( $ENV{'accounts'} );
 
-
 #
 #  Make sure we have $prefix/etc
 #
@@ -119,8 +118,6 @@ sub addAccount
             open( OUTY, ">>", $prefix . "/etc/passwd" );
             print OUTY $line . "\n";
             close( OUTY );
-
-            print "addexd\n";
         }
     }
     close( PASSWD );
@@ -129,11 +126,11 @@ sub addAccount
     #
     #  shadow file.
     #
-    open( SHADOW, "<", "/etc/shadow" ) or return;
+    open( SHADOW, "<", "/etc/shadow" ) or die "Failed to open : $!";
     foreach my $line ( <SHADOW> )
     {
         chomp( $line );
-        if ( $line =~ /\Q^$user:^E/ )
+        if ( $line =~ /^\Q$user\E:/ )
         {
             #
             #  Add the line
diff --git a/hooks/debian/35-setup-users b/hooks/debian/35-setup-users
index 76973f4..1df253c 100755
--- a/hooks/debian/35-setup-users
+++ b/hooks/debian/35-setup-users
@@ -27,7 +27,6 @@ die "Prefix must be a directory" unless ( -d $prefix );
 #
 exit unless ( $ENV{'accounts'} );
 
-
 #
 #  Make sure we have $prefix/etc
 #
@@ -119,8 +118,6 @@ sub addAccount
             open( OUTY, ">>", $prefix . "/etc/passwd" );
             print OUTY $line . "\n";
             close( OUTY );
-
-            print "addexd\n";
         }
     }
     close( PASSWD );
@@ -129,11 +126,11 @@ sub addAccount
     #
     #  shadow file.
     #
-    open( SHADOW, "<", "/etc/shadow" ) or return;
+    open( SHADOW, "<", "/etc/shadow" ) or die "Failed to open : $!";
     foreach my $line ( <SHADOW> )
     {
         chomp( $line );
-        if ( $line =~ /\Q^$user:^E/ )
+        if ( $line =~ /^\Q$user\E:/ )
         {
             #
             #  Add the line
diff --git a/hooks/gentoo/35-setup-users b/hooks/gentoo/35-setup-users
index 76973f4..1df253c 100755
--- a/hooks/gentoo/35-setup-users
+++ b/hooks/gentoo/35-setup-users
@@ -27,7 +27,6 @@ die "Prefix must be a directory" unless ( -d $prefix );
 #
 exit unless ( $ENV{'accounts'} );
 
-
 #
 #  Make sure we have $prefix/etc
 #
@@ -119,8 +118,6 @@ sub addAccount
             open( OUTY, ">>", $prefix . "/etc/passwd" );
             print OUTY $line . "\n";
             close( OUTY );
-
-            print "addexd\n";
         }
     }
     close( PASSWD );
@@ -129,11 +126,11 @@ sub addAccount
     #
     #  shadow file.
     #
-    open( SHADOW, "<", "/etc/shadow" ) or return;
+    open( SHADOW, "<", "/etc/shadow" ) or die "Failed to open : $!";
     foreach my $line ( <SHADOW> )
     {
         chomp( $line );
-        if ( $line =~ /\Q^$user:^E/ )
+        if ( $line =~ /^\Q$user\E:/ )
         {
             #
             #  Add the line
diff --git a/hooks/ubuntu/35-setup-users b/hooks/ubuntu/35-setup-users
index 76973f4..1df253c 100755
--- a/hooks/ubuntu/35-setup-users
+++ b/hooks/ubuntu/35-setup-users
@@ -27,7 +27,6 @@ die "Prefix must be a directory" unless ( -d $prefix );
 #
 exit unless ( $ENV{'accounts'} );
 
-
 #
 #  Make sure we have $prefix/etc
 #
@@ -119,8 +118,6 @@ sub addAccount
             open( OUTY, ">>", $prefix . "/etc/passwd" );
             print OUTY $line . "\n";
             close( OUTY );
-
-            print "addexd\n";
         }
     }
     close( PASSWD );
@@ -129,11 +126,11 @@ sub addAccount
     #
     #  shadow file.
     #
-    open( SHADOW, "<", "/etc/shadow" ) or return;
+    open( SHADOW, "<", "/etc/shadow" ) or die "Failed to open : $!";
     foreach my $line ( <SHADOW> )
     {
         chomp( $line );
-        if ( $line =~ /\Q^$user:^E/ )
+        if ( $line =~ /^\Q$user\E:/ )
         {
             #
             #  Add the line