diff --git a/beef b/beef
index b1fff4c21..ccbac1d38 100755
--- a/beef
+++ b/beef
@@ -120,7 +120,8 @@ BeEF::Core::Console::Banners.print_network_interfaces_count
 BeEF::Core::Console::Banners.print_network_interfaces_routes
 
 # @note Warn and replace on default credentials
-if config.get("beef.credentials.user").eql?('beef') && config.get("beef.credentials.passwd").eql?('beef')
+if config.get("beef.credentials.user").eql?('beef') &&
+   [/beef[0-9]*/, /passw[o0]rd[0-9]*/].select{|pattern| pattern.match(config.get("beef.credentials.passwd"))}.any?
   print_warning "Warning: Default username and password in use!"
   better_phrase = BeEF::Core::Crypto::secure_token(16)
   config.set("beef.credentials.passwd", better_phrase)