diff --git a/install.html b/install.html
index 7890ba6..9738ce3 100644
--- a/install.html
+++ b/install.html
@@ -21,7 +21,16 @@
 <legend>Base settings</legend>
 <div class="row">
     <div class="mb-3">
-		<label for="vpn">VPN proxy?</label>
+		<label for="user_auth">User auth enable?</label>
+		<select class="custom-select d-block w-100" name="USER_AUTH" id="user_auth">
+		<option value="yes">Yes</option>
+		<option value="no" selected>No</option>
+		</select>
+    </div>
+</div>
+<div class="row">
+    <div class="mb-3">
+		<label for="vpn">Proxy enable?</label>
 		<select class="custom-select d-block w-100" name="VPN_PROXY" id="vpn">
 		<option value="yes">Yes</option>
 		<option value="no" selected>No</option>
@@ -60,6 +69,15 @@
 	    </div>
 	</div>
 </div>
+<div class="row">
+    <div class="mb-3">
+		<label for="disagnostic">Diagnostic mode enable?</label>
+		<select class="custom-select d-block w-100" name="DIAGNOSTIC" id="disagnostic">
+		<option value="yes">Yes</option>
+		<option value="no" selected>No</option>
+		</select>
+    </div>
+</div>
 </fieldset>
 
 <fieldset>
@@ -121,263 +139,6 @@
     </div>
 </div>
 </fieldset>
-
-<!--
-<fieldset>
-<legend>Discover services</legend>
-<div class="row">
-    <div class="mb-3">
-		<label for="discovery">Would you like to discover services?</label>
-		<select class="custom-select d-block w-100" name="DISCOVERY" id="discovery">
-		<option value="yes" selected>Yes</option>
-		<option value="no">No</option>
-		</select>
-    </div>
-</div>
-<div id="div_discover">
-	<div class="row">
-	    <div class="mb-3">
-			<label for="discovery_dir">Path of service discovery scripts: (/usr/local/bin/)</label>
-			<input type="text" class="form-control" name="DISCOVERY_DIR" id="discovery_dir" value="/usr/local/bin/">
-	    </div>
-	</div>
-	<div class="row">
-	    <div class="mb-3">
-			<label for="dicovery_config_file">Path of the discovery config file: (discovery.conf)</label>
-			<input type="text" class="form-control" name="DISCOVERY_CONFIG_FILE" id="dicovery_config_file" value="discovery.conf">
-	    </div>
-	</div>
-</div>
-</fieldset>
--->
-
-<!--
-<fieldset>
-<legend>Additionals</legend>
-<div class="row">
-    <div class="mb-3">
-		<label for="additionals">Would you like to install additional applications?</label>
-		<select class="custom-select d-block w-100" name="ADDITIONALS" id="additionals">
-		<option value="yes">Yes</option>
-		<option value="no" selected>No</option>
-		</select>
-    </div>
-</div>
-<div id="div_additionals" class="hidden">
-	<div class="row">
-	    <div class="mb-3">
-			<label for="service_dir">Please add directory path of service files: (/etc/user/config/services/)</label>
-			<input type="text" class="form-control" name="SERVICE_DIR" id="service_dir" value="/etc/user/config/services">
-	    </div>
-	</div>
-	<div class="row">
-	    <div class="mb-3">
-			<label for="nextcloud">Do you want to install Nextcloud?</label>
-			<select class="custom-select d-block w-100" name="NEXTCLOUD" id="nextcloud">
-			<option value="yes">Yes</option>
-			<option value="no" selected>No</option>
-			</select>
-	    </div>
-	</div>
-	<fieldset id="div_nextcloud" class="sub_block hidden">
-		<legend>Nextcloud</legend>
-		<div class="row">
-		    <div class="mb-3">
-				<label for="nextcloud_domain">Please add Nextcloud domain: </label>
-				<input type="text" class="form-control" name="NEXTCLOUD_DOMAIN" id="nextcloud_domain" value="">
-		    </div>
-		</div>
-		<div class="row">
-		    <div class="mb-3">
-				<label for="nextcloud_username">Please add Nextcloud username: </label>
-				<input type="text" class="form-control" name="NEXTCLOUD_USERNAME" id="nextcloud_username" value="">
-		    </div>
-		</div>
-		<div class="row">
-		    <div class="mb-3">
-				<label for="nextcloud_password">Please add Nextcloud password: </label>
-				<input type="password" class="form-control" name="NEXTCLOUD_PASSWORD" id="nextcloud_password" value="">
-		    </div>
-		</div>
-	</fieldset>
-	<div class="row">
-	    <div class="mb-3">
-			<label for="bitwarden">Do you want to install Bitwarden?</label>
-			<select class="custom-select d-block w-100" name="BITWARDEN" id="bitwarden">
-			<option value="yes">Yes</option>
-			<option value="no" selected>No</option>
-			</select>
-	    </div>
-	</div>
-	<fieldset id="div_bitwarden" class="sub_block hidden">
-		<legend>Bitwarden</legend>
-		<div class="row">
-		    <div class="mb-3">
-				<label for="bitwarden_domain">Please add Bitwarden domain: </label>
-				<input type="text" class="form-control" name="BITWARDEN_DOMAIN" id="bitwarden_domain" value="">
-		    </div>
-		</div>
-		<div class="row">
-		    <div class="mb-3">
-			<label for="bitwarden_smtp">Please choose an SMTP server: &nbsp; &nbsp;</label>
-			<select class="custom-select d-block w-100" name="BITWARDEN_SMTP" id="bitwarden_smtp">
-			<option value="1" selected>Gmail</option>
-			<option value="2">Microsoft Outlook/Hotmail</option>
-			<option value="3">Other</option>
-			</select>
-		    </div>
-		</div>
-		<div id="div_bitwarden_smtp" class="hidden">
-			<div class="row">
-			    <div class="mb-3">
-				<label for="bitwarden_smtp_host">Please add SMTP HOST: &nbsp; &nbsp; &nbsp; &nbsp; </label>
-				<input type="text" class="form-control" name="BITWARDEN_SMTP_HOST" id="bitwarden_smtp_host" value="">
-			    </div>
-			</div>
-			<div class="row">
-			    <div class="mb-3">
-				<label for="bitwarden_smtp_port">Please add SMTP PORT (587, 465, 25, etc.): </label>
-				<input type="text" class="form-control" name="BITWARDEN_SMTP_PORT" id="bitwarden_smtp_port" value="">
-			    </div>
-			</div>
-			<div class="row">
-			    <div class="mb-3">
-				<label for="bitwarden_smtp_security">Please add SMTP SECURITY (starttls, force_tls, off, etc.): </label>
-				<input type="text" class="form-control" name="BITWARDEN_SMTP_SECURITY" id="bitwarden_smtp_security" value="">
-			    </div>
-			</div>
-		</div>
-		<div class="row">
-		    <div class="mb-3">
-			<label for="bitwarden_smtp_host">Please add SMTP FROM (mail address from): </label>
-			<input type="text" class="form-control" name="BITWARDEN_SMTP_FROM" id="bitwarden_smtp_from" value="">
-		    </div>
-		</div>
-		<div class="row">
-		    <div class="mb-3">
-			<label for="bitwarden_smtp_username">Please add SMTP USERNAME: </label>
-			<input type="text" class="form-control" name="BITWARDEN_SMTP_USERNAME" id="bitwarden_smtp_username" value="">
-		    </div>
-		</div>
-		<div class="row">
-		    <div class="mb-3">
-			<label for="bitwarden_smtp_password">Please add SMTP PASSWORD: </label>
-			<input type="password" class="form-control" name="BITWARDEN_SMTP_PASSWORD" id="bitwarden_smtp_password" value="">
-		    </div>
-		</div>
-		<div class="row">
-		    <div class="mb-3">
-			<label for="bitwarden_domains_whitelist">Please add Domains Whitelist (list of domains): </label>
-			<input type="text" class="form-control" name="BITWARDEN_DOMAINS_WHITELIST" id="bitwarden_domains_whitelist" value="">
-		    </div>
-		</div>
-	</fieldset>
-	<div class="row">
-	    <div class="mb-3">
-			<label for="guacamole">Do you want to install Guacamole?</label>
-			<select class="custom-select d-block w-100" name="GUACAMOLE" id="guacamole">
-			<option value="yes">Yes</option>
-			<option value="no" selected>No</option>
-			</select>
-	    </div>
-	</div>
-	<fieldset id="div_guacamole" class="sub_block hidden">
-		<legend>Guacamole</legend>
-		<div class="row">
-		    <div class="mb-3">
-				<label for="guacamole_domain">Please add Guacamole domain: </label>
-				<input type="text" class="form-control" name="GUACAMOLE_DOMAIN" id="guacamole_domain" value="">
-		    </div>
-		</div>
-		<div class="row">
-		    <div class="mb-3">
-				<label for="guacamole_username">Please add Guacamole admin username: </label>
-				<input type="text" class="form-control" name="GUACAMOLE_USERNAME" id="guacamole_username" value="">
-		    </div>
-		</div>
-		<div class="row">
-		    <div class="mb-3">
-				<label for="guacamole_password">Please add Guacamole admin password: </label>
-				<input type="password" class="form-control" name="GUACAMOLE_PASSWORD" id="guacamole_password" value="">
-		    </div>
-		</div>
-		<div class="row">
-		    <div class="mb-3">
-			<label for="guacemole_totp">Do you want TOTP via login? </label>
-			<select class="custom-select d-block w-100" name="GUACAMOLE_TOTP" id="guacamole_totp">
-			<option value="yes" selected>Yes</option>
-			<option value="no">No</option>
-			</select>
-		    </div>
-		</div>
-		<div class="row">
-		    <div class="mb-3">
-			<label for="guacamole_ban_duration">Do you want limitation in case invalid login or password? Please add a number how many minutes for deny retry. If you add 0 means it will disabled.";
-			</label>
-			<input type="text" class="form-control" name="GUACAMOLE_BAN_DURATION" id="guacamole_ban_duration" value="5">
-		    </div>
-		</div>
-	</fieldset>
-	<div class="row">
-	    <div class="mb-3">
-			<label for="smtp_server">Do you want to install SMTP server?</label>
-			<select class="custom-select d-block w-100" name="SMTP_SERVER" id="smtp_server">
-			<option value="yes">Yes</option>
-			<option value="no" selected>No</option>
-			</select>
-	    </div>
-	</div>
-	<div class="row">
-	    <div class="mb-3">
-			<label for="roundcube">Do you want to install roundcube?</label>
-			<select class="custom-select d-block w-100" name="ROUNDCUBE" id="roundcube">
-			<option value="yes">Yes</option>
-			<option value="no" selected>No</option>
-			</select>
-	    </div>
-	</div>
-	<fieldset id="div_roundcube" class="sub_block hidden">
-		<legend>Roundcube</legend>
-		<div class="row">
-		    <div class="mb-3">
-				<label for="roundcube_imap_host">Please add IMAP HOST: &nbsp; &nbsp; &nbsp; </label>
-				<input type="text" class="form-control" name="ROUNDCUBE_IMAP_HOST" id="roundcube_imap_host" value="">
-		    </div>
-		</div>
-		<div class="row">
-		    <div class="mb-3">
-				<label for="roundcube_imap_port">Please add IMAP PORT (default: 143): </label>
-				<input type="text" class="form-control" name="ROUNDCUBE_IMAP_PORT" id="roundcube_imap_port" value="143">
-		    </div>
-		</div>
-		<div class="row">
-		    <div class="mb-3">
-				<label for="roundcube_smtp_host">Please add SMTP HOST: &nbsp; &nbsp; &nbsp; &nbsp; </label>
-				<input type="text" class="form-control" name="ROUNDCUBE_SMTP_HOST" id="roundcube_smtp_host" value="">
-		    </div>
-		</div>
-		<div class="row">
-		    <div class="mb-3">
-				<label for="roundcube_smtp_port">Please add SMTP PORT (587, 465, 25, etc., default: 25): </label>
-				<input type="text" class="form-control" name="ROUNDCUBE_SMTP_PORT" id="roundcube_smtp_port" value="25">
-		    </div>
-		</div>
-		<div class="row">
-		    <div class="mb-3">
-				<label for="roundcube_upload">Please add UPLOAD_MAX_FILESIZE (default: 50M): </label>
-				<input type="text" class="form-control" name="ROUNDCUBE_UPLOAD" id="roundcube_upload" value="50M">
-		    </div>
-		</div>
-		<div class="row">
-		    <div class="mb-3">
-				<label for="roundcube_domain">Please add Roundcube DOMAIN: </label>
-				<input type="text" class="form-control" name="ROUNDCUBE_DOMAIN" id="roundcube_domain" value="">
-		    </div>
-		</div>
-	</div>
-</div>
-</fieldset>
--->
 <br>
 <button class="btn btn-lg btn-primary btn-block" type="submit">Start install</button>
 </form>