diff --git a/modules/auxiliary/admin/http/dlink_dsl320b_password_extractor.rb b/modules/auxiliary/admin/http/dlink_dsl320b_password_extractor.rb
index a152d4868b..9747a18cf1 100644
--- a/modules/auxiliary/admin/http/dlink_dsl320b_password_extractor.rb
+++ b/modules/auxiliary/admin/http/dlink_dsl320b_password_extractor.rb
@@ -28,7 +28,7 @@ class Metasploit3 < Msf::Auxiliary
 					[ 'URL', 'http://www.dlink.com/de/de/home-solutions/connect/modems-and-gateways/dsl-320b-adsl-2-ethernet-modem' ],
 				],
 			'Author'      => [
-				'Michael Messner <devnull@s3cur1ty.de>',
+				'Michael Messner <devnull[at]s3cur1ty.de>'
 			],
 			'License'     => MSF_LICENSE
 		)
diff --git a/modules/auxiliary/scanner/http/dlink_dir_300_615_http_login.rb b/modules/auxiliary/scanner/http/dlink_dir_300_615_http_login.rb
index ddc8b1213d..1bb2604a03 100644
--- a/modules/auxiliary/scanner/http/dlink_dir_300_615_http_login.rb
+++ b/modules/auxiliary/scanner/http/dlink_dir_300_615_http_login.rb
@@ -28,7 +28,7 @@ class Metasploit3 < Msf::Auxiliary
 			'Author'         =>
 				[
 					'hdm',	#http_login module
-					'Michael Messner <devnull@s3cur1ty.de>'	#dlink login included
+					'Michael Messner <devnull[at]s3cur1ty.de>'	#dlink login included
 				],
 			'References'     =>
 				[
diff --git a/modules/auxiliary/scanner/http/dlink_dir_615h_http_login.rb b/modules/auxiliary/scanner/http/dlink_dir_615h_http_login.rb
index c3893aed0e..0263a44f0a 100644
--- a/modules/auxiliary/scanner/http/dlink_dir_615h_http_login.rb
+++ b/modules/auxiliary/scanner/http/dlink_dir_615h_http_login.rb
@@ -26,7 +26,7 @@ class Metasploit3 < Msf::Auxiliary
 			},
 			'Author'         => [
 					'hdm',	#http_login module
-					'Michael Messner <devnull@s3cur1ty.de>'	#dlink login included
+					'Michael Messner <devnull[at]s3cur1ty.de>'	#dlink login included
 				],
 			'References'     =>
 				[
diff --git a/modules/auxiliary/scanner/http/dlink_dir_session_cgi_http_login.rb b/modules/auxiliary/scanner/http/dlink_dir_session_cgi_http_login.rb
index 71d46964f4..e8d24e321c 100644
--- a/modules/auxiliary/scanner/http/dlink_dir_session_cgi_http_login.rb
+++ b/modules/auxiliary/scanner/http/dlink_dir_session_cgi_http_login.rb
@@ -29,7 +29,7 @@ class Metasploit3 < Msf::Auxiliary
 			'Author'         =>
 				[
 					'hdm',	#http_login module
-					'Michael Messner <devnull@s3cur1ty.de>'	#dlink login included
+					'Michael Messner <devnull[at]s3cur1ty.de>'	#dlink login included
 				],
 			'References'     =>
 				[
diff --git a/modules/auxiliary/scanner/http/ssl.rb b/modules/auxiliary/scanner/http/ssl.rb
index 4ffe5a959e..08b173fa97 100644
--- a/modules/auxiliary/scanner/http/ssl.rb
+++ b/modules/auxiliary/scanner/http/ssl.rb
@@ -24,7 +24,7 @@ class Metasploit4 < Msf::Auxiliary
 				[
 					'et', #original module
 					'Chris John Riley', #additions
-					'Veit Hailperin <hailperv@gmail.com>', # checks for public key size, valid time
+					'Veit Hailperin <hailperv[at]gmail.com>', # checks for public key size, valid time
 				],
 			'License'     => MSF_LICENSE
 		)