diff --git a/install/template/template.php b/install/template/template.php
index 862a97af..5d4afd15 100644
--- a/install/template/template.php
+++ b/install/template/template.php
@@ -11,7 +11,7 @@
 <body>
 
 	<div id="body" class="container">
-	
+
 		<header id="header" class="pt-5 pb-4 pb-sm-5">
 			<h1>MyAAC <?php echo $locale['installation']; ?></h1>
 		</header>
@@ -28,10 +28,10 @@
 							if ($step == $value) {
 								$progress = ($i == 6) ? 100 : $i * 16;
 							}
-							
-							echo '<li' . ($step == $value ? ' class="list-group-item active"' : ' class="list-group-item"') . '>' . ++$i . '. ' . $locale['step_' . $value] . '</li>';
+
+							echo '<li class="list-group-item' . ($step == $value ? ' active' : '') . '">' . ++$i . '. ' . $locale['step_' . $value] . '</li>';
 						}
-							
+
 					?>
 				</ul>
 			</div>
@@ -71,4 +71,4 @@
 		<p style="text-align: center;"><?php echo base64_decode('UG93ZXJlZCBieSA8YSBocmVmPSJodHRwOi8vbXktYWFjLm9yZyIgdGFyZ2V0PSJfYmxhbmsiPk15QUFDLjwvYT4='); ?></p>
 	</footer>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/system/templates/install.config.html.twig b/system/templates/install.config.html.twig
index a6ba24f7..b25f9dbf 100644
--- a/system/templates/install.config.html.twig
+++ b/system/templates/install.config.html.twig
@@ -12,7 +12,7 @@
 	{% for value in ['server_path', 'mail_admin'] %}
 	<div class="form-group mb-2">
 		<label for="vars_{{ value }}">{{ locale['step_config_' ~ value]  }}</label>
-		<input class="form-control" type="text" name="vars[{{ value }}]" id="vars_{{ value }}"{% if session['var_' ~ value] is not null %} value="{{ session['var_' ~ value] }}"{% endif %}/>
+		<input class="form-control" type="{% if value == 'mail_admin' %}email{% else %}text{% endif %}" name="vars[{{ value }}]" id="vars_{{ value }}"{% if session['var_' ~ value] is not null %} value="{{ session['var_' ~ value] }}"{% endif %}/>
 		<small class="form-text text-muted">{{ locale['step_config_' ~ value ~ '_desc'] }}</small>
 	</div>
 	{% endfor %}
@@ -43,9 +43,9 @@
 		<input type="checkbox" name="vars[usage]" id="vars_usage" value="1"{% if session['var_usage'] is null or session['var_usage'] == 1 %} checked{% endif %}/>
 		<small class="form-text text-muted d-block">{{ locale.step_config_usage_desc }}</small>
 	</div>
-	
+
 	<div class="text-center m-3">
 	{{ buttons|raw }}
 	</div>
 
-</form>
\ No newline at end of file
+</form>
