diff --git a/modules/auxiliary/scanner/sap/sap_soap_bapi_user_create1.rb b/modules/auxiliary/scanner/sap/sap_soap_bapi_user_create1.rb
index 81fa615c40..564bfdddc7 100755
--- a/modules/auxiliary/scanner/sap/sap_soap_bapi_user_create1.rb
+++ b/modules/auxiliary/scanner/sap/sap_soap_bapi_user_create1.rb
@@ -43,6 +43,7 @@ class Metasploit4 < Msf::Auxiliary
 			'License' => MSF_LICENSE
 		)
 		register_options([
+			Opt::RPORT(8000),
 			OptString.new('CLIENT', [true, 'SAP client', '001']),
 			OptString.new('USERNAME', [true, 'Username', 'SAP*']),
 			OptString.new('PASSWORD', [true, 'Password', '06071992']),
diff --git a/modules/auxiliary/scanner/sap/sap_soap_rfc_read_table.rb b/modules/auxiliary/scanner/sap/sap_soap_rfc_read_table.rb
index d6f01b6043..70ea120c3c 100755
--- a/modules/auxiliary/scanner/sap/sap_soap_rfc_read_table.rb
+++ b/modules/auxiliary/scanner/sap/sap_soap_rfc_read_table.rb
@@ -46,9 +46,9 @@ class Metasploit4 < Msf::Auxiliary
 		register_options(
 			[
 				Opt::RPORT(8000),
-				OptString.new('CLIENT', [true, 'Client', nil]),
-				OptString.new('USERNAME', [true, 'Username', nil]),
-				OptString.new('PASSWORD', [true, 'Password', nil]),
+				OptString.new('CLIENT', [true, 'SAP client', '001']),
+				OptString.new('USERNAME', [true, 'Username', 'SAP*']),
+				OptString.new('PASSWORD', [true, 'Password', '06071992']),
 				OptString.new('TABLE', [true, 'Table to read', nil]),
 				OptString.new('FIELDS', [true, 'Fields to read', '*'])
 			], self.class)
diff --git a/modules/auxiliary/scanner/sap/sap_soap_rfc_system_info.rb b/modules/auxiliary/scanner/sap/sap_soap_rfc_system_info.rb
index 79b5665683..80c4168c0f 100755
--- a/modules/auxiliary/scanner/sap/sap_soap_rfc_system_info.rb
+++ b/modules/auxiliary/scanner/sap/sap_soap_rfc_system_info.rb
@@ -47,9 +47,9 @@ class Metasploit4 < Msf::Auxiliary
 		register_options(
 			[
 				Opt::RPORT(8000),
+				OptString.new('CLIENT', [true, 'SAP Client ', '001']),
 				OptString.new('USERNAME', [true, 'Username', 'SAP*']),
 				OptString.new('PASSWORD', [true, 'Password', '06071992']),
-				OptString.new('CLIENT', [true, 'Client ', '001']),
 			], self.class)
 	end
 
diff --git a/modules/auxiliary/scanner/sap/sap_soap_th_saprel_disclosure.rb b/modules/auxiliary/scanner/sap/sap_soap_th_saprel_disclosure.rb
index da5e849fdc..a3223710ca 100755
--- a/modules/auxiliary/scanner/sap/sap_soap_th_saprel_disclosure.rb
+++ b/modules/auxiliary/scanner/sap/sap_soap_th_saprel_disclosure.rb
@@ -46,9 +46,9 @@ class Metasploit4 < Msf::Auxiliary
 		register_options(
 			[
 				Opt::RPORT(8000),
-				OptString.new('CLIENT', [true, 'Client', nil]),
-				OptString.new('USERNAME', [true, 'Username', nil]),
-				OptString.new('PASSWORD', [true, 'Password', nil])
+				OptString.new('CLIENT', [true, 'SAP Client', '001']),
+				OptString.new('USERNAME', [true, 'Username', 'SAP*']),
+				OptString.new('PASSWORD', [true, 'Password', '06071992'])
 			], self.class)
 	end