diff --git a/op/op.PasswordForgotten.php b/op/op.PasswordForgotten.php
index cd35eb8b5..ed9af5c32 100644
--- a/op/op.PasswordForgotten.php
+++ b/op/op.PasswordForgotten.php
@@ -47,8 +47,7 @@ if (isset($_POST["login"])) {
 }
 
 if (empty($email) || empty($login)) {
-	header('Location: ../out/out.PasswordForgotten.php');
-	exit;
+	UI::exitError(getMLText("password_forgotten"),getMLText("no_email_or_login"));
 }
 
 $user = $dms->getUserByLogin($login, $email);
@@ -62,6 +61,6 @@ if($user) {
 	}
 }
 
-header('Location: ../out/out.Login.php');
+header('Location: ../out/out.PasswordSend.php');
 exit;
 ?>
diff --git a/out/out.PasswordSend.php b/out/out.PasswordSend.php
new file mode 100644
index 000000000..b12232c22
--- /dev/null
+++ b/out/out.PasswordSend.php
@@ -0,0 +1,39 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005 Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010-2011 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.ClassUI.php");
+
+include $settings->_rootDir . "languages/" . $settings->_language . "/lang.inc";
+
+if (isset($_REQUEST["referuri"]) && strlen($_REQUEST["referuri"])>0) {
+	$referrer = $_REQUEST["referuri"];
+} else {
+	$referrer = '';
+}
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('referrer'=>$referrer));
+if($view) {
+	$view->show();
+	exit;
+}
+
+?>
diff --git a/views/bootstrap/class.PasswordSend.php b/views/bootstrap/class.PasswordSend.php
new file mode 100644
index 000000000..a44f766b1
--- /dev/null
+++ b/views/bootstrap/class.PasswordSend.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Implementation of PasswordSend view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Include parent class
+ */
+require_once("class.Bootstrap.php");
+
+/**
+ * Class which outputs the html page for PasswordSend view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_View_PasswordSend extends SeedDMS_Bootstrap_Style {
+
+	function show() { /* {{{ */
+		$referrer = $this->params['referrer'];
+
+		$this->htmlStartPage(getMLText("password_send"), "login");
+		$this->globalBanner();
+		$this->contentStart();
+		$this->pageNavigation(getMLText("password_send"));
+?>
+
+<?php $this->contentContainerStart(); ?>
+<?php printMLText('password_send_text'); ?>
+<?php $this->contentContainerEnd(); ?>
+<p><a href="../out/out.Login.php"><?php echo getMLText("login"); ?></a></p>
+<?php
+		$this->htmlEndPage();
+	} /* }}} */
+}
+?>