diff --git a/install/core/i18n/de_DE/install.json b/install/core/i18n/de_DE/install.json
new file mode 100644
index 0000000000..a7228c520b
--- /dev/null
+++ b/install/core/i18n/de_DE/install.json
@@ -0,0 +1,110 @@
+{
+	"labels": {
+		"Main page title": "Welcome to EspoCRM",
+		"Main page header": "",
+		"Start page title": "License Agreement",
+		"Step1 page title": "License Agreement",
+		"License Agreement": "License Agreement",
+		"I accept the agreement": "I accept the agreement",
+		"Step2 page title": "Database configuration",
+		"Step3 page title": "Administrator Setup",
+		"Step4 page title": "System settings",
+		"Step5 page title": "SMTP settings for outgoing emails",
+		"Errors page title": "Errors",
+		"Finish page title": "Installation is complete",
+		"Congratulation! Welcome to EspoCRM!": "Congratulation! EspoCRM has been successfully installed.",
+		"admin": "admin",
+		"localhost": "localhost",
+		"port": "3306",
+		"Locale": "Locale",
+		"Outbound Email Configuration": "Outbound Email Configuration",
+		"SMTP": "SMTP",
+		"Start": "Start",
+		"Back": "Back",
+		"Next": "Next",
+		"Go to EspoCRM": "Go to EspoCRM",
+		"Re-check": "Re-check",
+		"Test settings": "Test Connection"
+	},
+	"fields": {
+		"Choose your language:": "Choose your language:",
+		"Database Name": "Database Name",
+		"Host Name": "Host Name",
+		"Port": "Port",
+		"Database User Name": "Database User Name",
+		"Database User Password": "Database User Password",
+		"Database driver": "Database driver",
+		"User Name": "User Name",
+		"Password": "Password",
+		"Confirm Password": "Confirm your Password",
+		"From Address": "From Address",
+		"From Name": "From Name",
+		"Is Shared": "Is Shared",
+		"Date Format": "Date Format",
+		"Time Format": "Time Format",
+		"Time Zone": "Time Zone",
+		"First Day of Week": "First Day of Week",
+		"Thousand Separator": "Thousand Separator",
+		"Decimal Mark": "Decimal Mark",
+		"Default Currency": "Default Currency",
+		"Currency List": "Currency List",
+		"Language": "Language",
+		"smtpServer": "Server",
+		"smtpPort": "Port",
+		"smtpAuth": "Auth",
+		"smtpSecurity": "Security",
+		"smtpUsername": "Username",
+		"emailAddress": "Email",
+		"smtpPassword": "Password"
+	},
+	"messages": {
+		"Bad init Permission": "Permission denied for \"{*}\" directory. Please set 775 for \"{*}\" or just execute this command in the terminal <pre><b>{C}<\/b><\/pre>\n\tOperation not permitted? Try this one: {CSU}",
+		"Some errors occurred!": "Some errors occurred!",
+		"Supported php version >=": "Supported php version >=",
+		"The PHP extension was not found...": "The <b>{extName}<\/b> PHP extension was not found...",
+		"All Settings correct": "All Settings are correct",
+		"Failed to connect to database": "Failed to connect to database",
+		"PHP version:": "PHP version:",
+		"You must agree to the license agreement": "You must agree to the license agreement",
+		"Passwords do not match": "Passwords do not match",
+		"Enable mod_rewrite in Apache server": "Enable mod_rewrite in Apache server",
+		"checkWritable error": "checkWritable error",
+		"applySett error": "applySett error",
+		"buildDatabse error": "buildDatabse error",
+		"createUser error": "createUser error",
+		"checkAjaxPermission error": "checkAjaxPermission error",
+		"Ajax failed": "Ajax failed",
+		"Cannot create user": "Cannot create user",
+		"Permission denied": "Permission denied",
+		"permissionInstruction": "<br>Run this in Terminal<pre><b>\"{C}\"<\/b><\/pre>",
+		"operationNotPermitted" : "Operation not permitted? Try this: <br>{CSU}",
+		"Permission denied to": "Permission denied",
+		"Can not save settings": "Can not save settings",
+		"Cannot save preferences": "Cannot save preferences",
+		"Thousand Separator and Decimal Mark equal": "Thousand Separator and Decimal Mark cannot be equal",
+		"1049": "Unknown database",
+		"2005": "Unknown MySQL server host",
+		"1045": "Access denied for user"
+	},
+	"options": {
+		"db driver": {
+			"mysqli": "MySQLi",
+			"pdo_mysql": "PDO MySQL"
+		},
+		"modRewriteInstruction": {
+			"apache": {
+				"linux": "<br><br>To enable .htaccess support add/edit the Server configuration settings inside your &#60;VirtualHost&#62; section (httpd.conf):<pre>&#60;Directory \/PATH_TO_ESPO\/&#62;\n <b>AllowOverride All<\/b>\n&#60;\/Directory&#62;<\/pre>\n Afterwards run this command in a Terminal:<pre><b>service apache2 restart<\/b><\/pre><br>To enable \"mod_rewrite\" run those commands in a Terminal:<pre><b>a2enmod rewrite <br>service apache2 restart<\/b><\/pre>",
+				"windows": "<br> <pre>1. Find the httpd.conf file (usually you will find it in a folder called conf, config or something along those lines)<br>\n2. Inside the httpd.conf file uncomment the line LoadModule rewrite_module modules\/mod_rewrite.so (remove the pound '#' sign from in front of the line)<br>\n3. Also find the line ClearModuleList is uncommented then find and make sure that the line AddModule mod_rewrite.c is not commented out.\n<\/pre>"
+			},
+			"microsoft-iis": {
+				"windows": ""
+			}
+		},
+		"modRewriteHelp": {
+			"apache": "API Error: EspoCRM API unavailable.<br> Possible problems: disabled \"mod_rewrite\" in Apache server or .htaccess support.",
+			"nginx": "API Error: EspoCRM API unavailable.<br> Add this code to Nginx Host Config (inside \"server\" block):<br>\n<pre>\nlocation \/api\/v1\/ {\n    if (!-e $request_filename){\n        rewrite ^\/api\/v1\/(.*)$ \/api\/v1\/index.php last; break;\n    }\n}\n\nlocation \/ {\n    rewrite reset\/?$ reset.html break;\n}<\/pre>",
+			"microsoft-iis": "API Error: EspoCRM API unavailable.<br> Possible problem: disabled \"URL Rewrite\". Please check and enable \"URL Rewrite\" Module in IIS server",
+			"default": "API Error: EspoCRM API unavailable.<br> Possible problem: disabled Rewrite Module. Please check and enable Rewrite Module in your server (e.g. mod_rewrite in Apache) and .htaccess support."
+		}
+	}
+}
diff --git a/install/core/i18n/es_ES/install.json b/install/core/i18n/es_ES/install.json
index aac38da4ae..0b85071213 100644
--- a/install/core/i18n/es_ES/install.json
+++ b/install/core/i18n/es_ES/install.json
@@ -26,9 +26,10 @@
 		"Test settings": "Test de conexión"
 	},
 	"fields": {
-		"Choose your language: ": "Seleccione un lenguaje:",
+		"Choose your language:": "Seleccione un lenguaje:",
 		"Database Name": "Nombre de la Base de Datos",
 		"Host Name": "Hostname usualmente(localhost)",
+		"Port": "Puerto",
 		"Database User Name": "Usuario de la Base de Datos",
 		"Database User Password": "Contraseña de la Base de Datos",
 		"Database driver": "Controlador de base de datos",
diff --git a/install/index.php b/install/index.php
index 47765bc5be..662307657c 100644
--- a/install/index.php
+++ b/install/index.php
@@ -24,6 +24,17 @@ session_start();
 
 require_once('../bootstrap.php');
 
+
+// temp save all settings
+$ignore = array('desc', 'dbName', 'hostName', 'dbUserName', 'dbUserPass', 'dbDriver');
+
+if (!empty($_REQUEST)) {
+	foreach ($_REQUEST as $key => $val) {
+		if (!in_array($val, $ignore))
+		$_SESSION['install'][$key] = trim($val);
+	}
+}
+
 // get user selected language
 $userLang = (!empty($_SESSION['install']['user-lang']))? $_SESSION['install']['user-lang'] : 'en_US';
 $langFileName = 'core/i18n/'.$userLang.'/install.json';
@@ -72,15 +83,6 @@ else {
 $smarty->caching = false;
 $smarty->setTemplateDir('install/core/tpl');
 
-// temp save all settings
-$ignore = array('desc', 'dbName', 'hostName', 'dbUserName', 'dbUserPass', 'dbDriver');
-if (!empty($_REQUEST)) {
-	foreach ($_REQUEST as $key => $val) {
-		if (!in_array($val, $ignore))
-		$_SESSION['install'][$key] = trim($val);
-	}
-}
-
 $smarty->assign("langs", $langs);
 $smarty->assign("langsJs", json_encode($langs));