diff --git a/administrator/language/en-GB/en-GB.en-GB.plg_system_jefreg.ini b/administrator/language/en-GB/en-GB.plg_system_jefreg.ini
similarity index 100%
rename from administrator/language/en-GB/en-GB.en-GB.plg_system_jefreg.ini
rename to administrator/language/en-GB/en-GB.plg_system_jefreg.ini
diff --git a/plugins/system/jefreg/jefreg.php b/plugins/system/jefreg/jefreg.php
index f894add..161343f 100644
--- a/plugins/system/jefreg/jefreg.php
+++ b/plugins/system/jefreg/jefreg.php
@@ -134,7 +134,7 @@ private function isDataOK()
 		$jefreg = $this->getJEFReg();
 		
 		// Use JFormRuleUrl to check if $_POST['installat'] is valid URL
-		$field = new SimpleXMLElement('<field></field>');
+		$field = new SimpleXMLElement('<field required="true"></field>');
 		$rule = new JFormRuleUrl;
 		return $rule->test($field, $jefreg['installat']) &&
 			$this->getInstallFrom($jefreg['installapp']);
@@ -169,7 +169,7 @@ private function getInstallFrom($appid)
 		// Basic clean up of 'files' parameter as set in plugin options
 		$files = $this->params->get('files', null);
 		$files = preg_replace('/\s*=\s*>\s*/', '=>', $files);
-		$files = preg_replace('/^\s*\**\s*/', '*', $files);
+		$files = preg_replace('/[^\S\n]*\*\s*/', '*', $files);
 		$files = preg_split('/\s+/', $files);
 
 		// Match the $_POST value of the JED ID [$appid] with the extensions available on the server
@@ -183,7 +183,7 @@ private function getInstallFrom($appid)
 				$installfrom = '&installfrom='.base64_encode($matches[1].'&sessid='.session_id());
 			}
 			// Check for file that is available after purchase
-			elseif (preg_match('/^\*.*:'.$appid.'=>(.+)/', trim($f), $matches))
+			elseif (preg_match('/^\*.*'.$appid.'=>(.+)/', trim($f), $matches))
 			{
 				// If found, set commercial flag ON
 				$this->setCommercialOn();