--- a/branches/2.5.4RC1/cgi-bin/yabb2/Admin/Admin.pm
+++ b/branches/2.5.4RC1/cgi-bin/yabb2/Admin/Admin.pm
@@ -18,7 +18,7 @@
 use Time::Local 'timelocal';
 our $VERSION = '2.5.41';
 
-$adminpmver = 'YaBB 2.5.4 RC1 $Revision: 1380 $';
+$adminpmver = 'YaBB 2.5.4 RC1 $Revision: 1384 $';
 LoadLanguage('Credits');
 
 get_template('AdminCentre');
@@ -1434,6 +1434,9 @@
     {
         fatal_error('no_admin_passwrd');
     }
+    elsif ( $iamadmin && encode_password( 'admin') eq ${ $uid . $user }{'password'} )  {
+		fatal_error('default_password');
+    }
 
     my $adminpass = 'adminpass';
     my $cookiename = "$cookieusername$adminpass";