diff --git a/setup/inc/class.installer.php b/setup/inc/class.installer.php
index 23dbac500c71209d4a826821fbbf2e31b2d30e66..23ebd7ffc071d81d6fb4ffec2ca2aea2e08adcdf 100644
--- a/setup/inc/class.installer.php
+++ b/setup/inc/class.installer.php
@@ -213,6 +213,12 @@ class Installer extends SetupWizard {
 	            if(!db_query($sql, false))
 	                $this->errors['err']='Unable to create config settings (#7)';
 			}
+
+            // Set company name
+            require_once(INCLUDE_DIR.'class.company.php');
+            $company = new Company();
+            $company->getForm()->setAnswer('name', $vars['name']);
+            $company->getForm()->save();
         }
 
         if($this->errors) return false; //Abort on internal errors.