diff --git a/src/messenger/webim/libs/operator.php b/src/messenger/webim/libs/operator.php
index 46591e64..9fb9f2c5 100755
--- a/src/messenger/webim/libs/operator.php
+++ b/src/messenger/webim/libs/operator.php
@@ -117,12 +117,6 @@ function update_operator($operatorid, $login, $email, $jabber, $password, $local
 
 	perform_query($query, $link);
 	mysql_close($link);
-	// update the session password
-	if (isset($password))
-	{
-		$_SESSION[$mysqlprefix.'operator']['vcpassword']=md5($password);
-	}
-
 }
 
 function update_operator_avatar($operatorid, $avatar)
@@ -244,17 +238,6 @@ function check_login($redirect = true)
 	return $_SESSION["${mysqlprefix}operator"];
 }
 
-// Force the admin to set a password after the installation
-function force_password($operator)
-{
-	global $webimroot;
-	if($operator['vcpassword']==md5(''))
-	{
-		header("Location: $webimroot/operator/operator.php?op=1");
-		exit;
-	}
-}
-
 function get_logged_in()
 {
 	global $mysqlprefix;
diff --git a/src/messenger/webim/locales/de/properties b/src/messenger/webim/locales/de/properties
index 0f395517..8b3d807e 100644
--- a/src/messenger/webim/locales/de/properties
+++ b/src/messenger/webim/locales/de/properties
@@ -212,7 +212,6 @@ menu.translate=Regionalisieren
 menu.updates.content=Auf Nachrichten und Updates prüfen.
 menu.updates=Updates
 my_settings.error.password_match=Die Passwörter stimmen nicht überein
-my_settings.error.no_password=Es ist noch kein Passwort für den Administrator gesetzt
 no_such_operator=Kein solcher Operator
 operator.group.no_description=<keine Beschreibung>
 operator.groups.intro=Wähle Gruppen nach Operator Qualifikation.
diff --git a/src/messenger/webim/locales/en/properties b/src/messenger/webim/locales/en/properties
index c9bcd360..277a622d 100644
--- a/src/messenger/webim/locales/en/properties
+++ b/src/messenger/webim/locales/en/properties
@@ -122,6 +122,8 @@ errors.prefix=<li class="error">
 errors.required=Please fill "{0}".  
 errors.suffix=</li>
 errors.wrong_field=Please fill "{0}" correctly.
+error.no_password=This is your first time logging in and your password is blank. For security reasons you have to change it.
+error.no_password.visit_profile=Visit your <a href="{0}">Profile Page</a>.
 features.saved=Features activated
 form.field.address.description=Ex: 12.23.45.123 or todo.com
 form.field.address=Visitor's Address
@@ -242,7 +244,6 @@ menu.profile=Profile
 menu.translate=Localize
 menu.updates.content=Check for news and updates.
 menu.updates=Updates
-my_settings.error.no_password=No Password set for the Administrator
 my_settings.error.password_match=Entered passwords do not match
 no_such_operator=No such operator
 notification.back_to_list=Back to the list
@@ -525,9 +526,9 @@ time.never=Never
 time.timeformat=%I:%M %p
 time.today.at=Today at
 time.yesterday.at=Yesterday at
-topMenu.admin=Home
+topMenu.admin=Dashboard
 topMenu.logoff=Exit
-topMenu.main=Home
+topMenu.main=Dashboard
 topMenu.users.nomenu=without menu
 topMenu.users=Visitors
 translate.direction=Direction:
diff --git a/src/messenger/webim/operator/canned.php b/src/messenger/webim/operator/canned.php
index c665ddf0..9d9f7886 100644
--- a/src/messenger/webim/operator/canned.php
+++ b/src/messenger/webim/operator/canned.php
@@ -26,8 +26,6 @@ require_once('../libs/groups.php');
 require_once('../libs/pagination.php');
 
 $operator = check_login();
-force_password($operator);
-
 loadsettings();
 
 $errors = array();
diff --git a/src/messenger/webim/operator/getcode.php b/src/messenger/webim/operator/getcode.php
index 943b8309..27446db7 100644
--- a/src/messenger/webim/operator/getcode.php
+++ b/src/messenger/webim/operator/getcode.php
@@ -25,8 +25,6 @@ require_once('../libs/groups.php');
 require_once('../libs/getcode.php');
 
 $operator = check_login();
-force_password($operator);
-
 loadsettings();
 
 $imageLocales = get_image_locales_map("../locales");
diff --git a/src/messenger/webim/operator/history.php b/src/messenger/webim/operator/history.php
index 015ce66d..0f0e6b8b 100644
--- a/src/messenger/webim/operator/history.php
+++ b/src/messenger/webim/operator/history.php
@@ -26,8 +26,6 @@ require_once('../libs/userinfo.php');
 require_once('../libs/pagination.php');
 
 $operator = check_login();
-force_password($operator);
-
 loadsettings();
 
 setlocale(LC_TIME, getstring("time.locale"));
diff --git a/src/messenger/webim/operator/index.php b/src/messenger/webim/operator/index.php
index adbbfba0..b4af107c 100644
--- a/src/messenger/webim/operator/index.php
+++ b/src/messenger/webim/operator/index.php
@@ -23,7 +23,6 @@ require_once('../libs/common.php');
 require_once('../libs/operator.php');
 
 $operator = check_login();
-force_password($operator);
 
 $link = connect();
 loadsettings_($link);
@@ -34,6 +33,8 @@ $page = array(
 	'version' => $version,
 	'localeLinks' => get_locale_links("$webimroot/operator/index.php"),
 	'needUpdate' => $settings['dbversion'] != $dbversion,
+	'needChangePassword' => $operator['vcpassword'] == md5(''),
+	'profilePage' => "$webimroot/operator/operator.php?op=".$operator['operatorid'],
 	'updateWizard' => "$webimroot/install/",
 	'newFeatures' => $settings['featuresversion'] != $featuresversion,
 	'featuresPage' => "$webimroot/operator/features.php",
diff --git a/src/messenger/webim/operator/login.php b/src/messenger/webim/operator/login.php
index 88c31ff7..df202de5 100644
--- a/src/messenger/webim/operator/login.php
+++ b/src/messenger/webim/operator/login.php
@@ -33,9 +33,11 @@ if (isset($_POST['login']) && isset($_POST['password'])) {
 	$operator = operator_by_login($login);
 	if ($operator && isset($operator['vcpassword']) && $operator['vcpassword'] == md5($password)) {
 
-		$target = isset($_SESSION['backpath'])
-				? $_SESSION['backpath']
-				: "$webimroot/operator/index.php";
+		$target = $password == ''
+				? "$webimroot/operator/operator.php?op=" . $operator['operatorid']
+				: (isset($_SESSION['backpath'])
+					? $_SESSION['backpath']
+					: "$webimroot/operator/index.php");
 
 		login_operator($operator, $remember);
 		header("Location: $target");
diff --git a/src/messenger/webim/operator/notifications.php b/src/messenger/webim/operator/notifications.php
index 2d678995..d20fc4cb 100644
--- a/src/messenger/webim/operator/notifications.php
+++ b/src/messenger/webim/operator/notifications.php
@@ -25,7 +25,6 @@ require_once('../libs/operator.php');
 require_once('../libs/pagination.php');
 
 $operator = check_login();
-force_password($operator);
 
 $page = array();
 $errors = array();
diff --git a/src/messenger/webim/operator/operator.php b/src/messenger/webim/operator/operator.php
index 4efb6776..ffc091fe 100644
--- a/src/messenger/webim/operator/operator.php
+++ b/src/messenger/webim/operator/operator.php
@@ -91,6 +91,15 @@ if (isset($_POST['login']) && isset($_POST['password'])) {
 			exit;
 		} else {
 			update_operator($opId, $login, $email, $jabber, $password, $localname, $commonname, $jabbernotify ? 1 : 0);
+			// update the session password
+			if (isset($password) && $opId == $operator['operatorid']) {
+				$toDashboard = $operator['vcpassword'] == md5('') && $password != '';
+				$_SESSION["${mysqlprefix}operator"]['vcpassword'] = md5($password);
+				if($toDashboard) {
+					header("Location: $webimroot/operator/index.php");
+					exit;
+				}
+			}
 			header("Location: $webimroot/operator/operator.php?op=$opId&stored");
 			exit;
 		}
@@ -112,12 +121,6 @@ if (isset($_POST['login']) && isset($_POST['password'])) {
 		$errors[] = getlocal("no_such_operator");
 		$page['opid'] = topage($opId);
 	} else {
-		//show an error if the admin password hasn't been set yet.
-		if ($operator['vcpassword']==md5('') && !isset($_GET['stored']))
-		{
-			$errors[] = getlocal("my_settings.error.no_password");
-		}
-
 		$page['formlogin'] = topage($op['vclogin']);
 		$page['formname'] = topage($op['vclocalename']);
 		$page['formemail'] = topage($op['vcemail']);
@@ -138,6 +141,7 @@ $canmodify = ($opId == $operator['operatorid'] && is_capable($can_modifyprofile,
 $page['stored'] = isset($_GET['stored']);
 $page['canmodify'] = $canmodify ? "1" : "";
 $page['showjabber'] = $settings['enablejabber'] == "1";
+$page['needChangePassword'] = $operator['vcpassword'] == md5('');
 
 prepare_menu($operator);
 setup_operator_settings_tabs($opId, 0);
diff --git a/src/messenger/webim/operator/operators.php b/src/messenger/webim/operator/operators.php
index eeb01e37..b73d976f 100644
--- a/src/messenger/webim/operator/operators.php
+++ b/src/messenger/webim/operator/operators.php
@@ -23,8 +23,6 @@ require_once('../libs/common.php');
 require_once('../libs/operator.php');
 
 $operator = check_login();
-force_password($operator);
-
 
 if (isset($_GET['act']) && $_GET['act'] == 'del') {
 	$operatorid = isset($_GET['id']) ? $_GET['id'] : "";
diff --git a/src/messenger/webim/operator/settings.php b/src/messenger/webim/operator/settings.php
index 894e8d6d..77025774 100644
--- a/src/messenger/webim/operator/settings.php
+++ b/src/messenger/webim/operator/settings.php
@@ -24,7 +24,6 @@ require_once('../libs/operator.php');
 require_once('../libs/settings.php');
 
 $operator = check_login();
-force_password($operator);
 
 $page = array('agentId' => '');
 $errors = array();
diff --git a/src/messenger/webim/operator/statistics.php b/src/messenger/webim/operator/statistics.php
index dc5b0af2..f2c1add5 100644
--- a/src/messenger/webim/operator/statistics.php
+++ b/src/messenger/webim/operator/statistics.php
@@ -24,7 +24,6 @@ require_once('../libs/chat.php');
 require_once('../libs/operator.php');
 
 $operator = check_login();
-force_password($operator);
 
 setlocale(LC_TIME, getstring("time.locale"));
 
diff --git a/src/messenger/webim/operator/translate.php b/src/messenger/webim/operator/translate.php
index 575d6eb7..5e271ce6 100644
--- a/src/messenger/webim/operator/translate.php
+++ b/src/messenger/webim/operator/translate.php
@@ -119,8 +119,6 @@ function get_auxiliary($s)
 }
 
 $operator = check_login();
-force_password($operator);
-
 
 $source = verifyparam("source", "/^[\w-]{2,5}$/", $default_locale);
 $target = verifyparam("target", "/^[\w-]{2,5}$/", $current_locale);
diff --git a/src/messenger/webim/operator/updates.php b/src/messenger/webim/operator/updates.php
index 63455e0c..d36f8f12 100644
--- a/src/messenger/webim/operator/updates.php
+++ b/src/messenger/webim/operator/updates.php
@@ -24,7 +24,6 @@ require_once('../libs/operator.php');
 require_once('../libs/settings.php');
 
 $operator = check_login();
-force_password($operator);
 
 $default_extensions = array('mysql', 'gd', 'iconv');
 
diff --git a/src/messenger/webim/operator/users.php b/src/messenger/webim/operator/users.php
index d69d7528..41983f42 100644
--- a/src/messenger/webim/operator/users.php
+++ b/src/messenger/webim/operator/users.php
@@ -24,7 +24,6 @@ require_once('../libs/operator.php');
 require_once('../libs/groups.php');
 
 $operator = check_login();
-force_password($operator);
 
 $status = isset($_GET['away']) ? 1 : 0;
 
diff --git a/src/messenger/webim/view/agent.php b/src/messenger/webim/view/agent.php
index 10534d6f..e61ae1d3 100644
--- a/src/messenger/webim/view/agent.php
+++ b/src/messenger/webim/view/agent.php
@@ -39,10 +39,15 @@ function tpl_content() { global $page, $webimroot, $errors;
 <?php 
 require_once('inc_errors.php');
 ?>
-<?php if( $page['stored'] ) { ?>
+<?php if( $page['needChangePassword'] ) { ?>
+<div id="formmessage"><?php echo getlocal("error.no_password") ?></div>
+<br/>
+<?php } else if( $page['stored'] ) { ?>
 <div id="formmessage"><?php echo getlocal("data.saved") ?></div>
 <?php } ?>
 
+
+
 <?php if( $page['opid'] || $page['canmodify'] ) { ?>
 <form name="agentForm" method="post" action="<?php echo $webimroot ?>/operator/operator.php">
 <input type="hidden" name="opid" value="<?php echo $page['opid'] ?>"/>
@@ -51,7 +56,7 @@ require_once('inc_errors.php');
 <?php if(form_value_cb('jabbernotify')) { ?><input type="hidden" name="jabbernotify" value="on"/><?php } ?>
 <?php } ?> 
 	<div>
-<?php print_tabbar(); ?>
+<?php if(!$page['needChangePassword']) { print_tabbar(); } ?>
 	<div class="mform"><div class="formtop"><div class="formtopi"></div></div><div class="forminner">
 
 	<div class="fieldForm">
@@ -74,7 +79,7 @@ require_once('inc_errors.php');
 		</div>
 
 		<div class="field">
-			<div class="flabel"><?php echo getlocal('form.field.password') ?><?php if( !$page['opid'] ) { ?><span class="required">*</span><?php } ?></div>
+			<div class="flabel"><?php echo getlocal('form.field.password') ?><?php if( !$page['opid'] || $page['needChangePassword'] ) { ?><span class="required">*</span><?php } ?></div>
 			<div class="fvalue">
 				<input type="password" name="password" size="40" value="" class="formauth"<?php echo $page['canmodify'] ? "" : " disabled=\"disabled\"" ?>/>
 			</div>
@@ -83,7 +88,7 @@ require_once('inc_errors.php');
 		</div>
 
 		<div class="field">
-			<div class="flabel"><?php echo getlocal('form.field.password_confirm') ?><?php if( !$page['opid'] ) { ?><span class="required">*</span><?php } ?></div>
+			<div class="flabel"><?php echo getlocal('form.field.password_confirm') ?><?php if( !$page['opid'] || $page['needChangePassword'] ) { ?><span class="required">*</span><?php } ?></div>
 			<div class="fvalue">
 				<input type="password" name="passwordConfirm" size="40" value="" class="formauth"<?php echo $page['canmodify'] ? "" : " disabled=\"disabled\"" ?>/>
 			</div>
diff --git a/src/messenger/webim/view/menu.php b/src/messenger/webim/view/menu.php
index 2df7f780..aaf26652 100644
--- a/src/messenger/webim/view/menu.php
+++ b/src/messenger/webim/view/menu.php
@@ -41,8 +41,12 @@ function menuseparator() {
 function tpl_content() { global $page, $webimroot, $current_locale, $menuItemsCount, $version;
 ?>
 
-<br/>   
-<?php if( $page['needUpdate'] ) { ?>
+<br/>
+
+<?php if( $page['needChangePassword'] ) { ?>
+<div id="formmessage"><?php echo getlocal("error.no_password") ?> <?php echo getlocal2("error.no_password.visit_profile", array($page['profilePage'])) ?></div>
+<br/>
+<?php } else if( $page['needUpdate'] ) { ?>
 <div id="formmessage"><?php echo getlocal2("install.updatedb",array($page['updateWizard'])) ?></div>
 <br/>
 <?php } else if($page['newFeatures']) { ?>