Merge branch '6035-password-reset-to-login' into 'develop'

Use password form after resetting password

Closes #6035

See merge request ispconfig/ispconfig3!1395

interface/web/login/password_reset.php

@@ -153,6 +153,7 @@ if(isset($_POST['username']) && is_string($_POST['username']) && $_POST['usernam
 
 			if($send_result !== false) {
 				$app->tpl->setVar("msg", $wb['pw_reset']);
+				$app->tpl->setInclude('content_tpl', 'templates/index.htm');
 			} else {
 				$app->tpl->setVar("error", $wb['pw_reset_error_smtp_connection']);
 			}

interface/web/login/templates/index.htm

+					<tmpl_if name="msg">
+					<div class="alert alert-success" role="alert"><tmpl_var name="msg"></div>
+					</tmpl_if>
 					<tmpl_if name="error">
 					<div class="alert alert-danger" role="alert"><tmpl_var name="error"></div>
 					</tmpl_if>