diff --git a/beef b/beef
index f6612c219..2ea7b65ca 100755
--- a/beef
+++ b/beef
@@ -119,9 +119,13 @@ BeEF::Core::Console::Banners.print_loaded_modules
 BeEF::Core::Console::Banners.print_network_interfaces_count
 BeEF::Core::Console::Banners.print_network_interfaces_routes
 
-# @note Warn on default credentials
-if config.get("beef.credentials.user").eql?('beef') && config.get("beef.credentials.passwd").eql?('beef')
-  print_warning "Warning: Default username and password in use!"
+# @note Warn and replace on default credentials
+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 weak password in use!"
+  better_phrase = BeEF::Core::Crypto::secure_token(16)
+  config.set("beef.credentials.passwd", better_phrase)
+  print_more "New password for this instance: #{better_phrase}"
 end
 
 # @note create ~/.beef/