diff --git a/src/messenger/webim/operator/operator.php b/src/messenger/webim/operator/operator.php
index 8dd6d259..f03c9fcd 100644
--- a/src/messenger/webim/operator/operator.php
+++ b/src/messenger/webim/operator/operator.php
@@ -29,9 +29,13 @@ $page = array('opid' => '');
 $errors = array();
 $opId = '';
 
-if (isset($_POST['login']) && isset($_POST['password'])) {
+if ((isset($_POST['login']) || !is_capable($can_administrate, $operator)) && isset($_POST['password'])) {
 	$opId = verifyparam("opid", "/^(\d{1,9})?$/", "");
-	$login = getparam('login');
+	if (is_capable($can_administrate, $operator)) {
+		$login = getparam('login');
+	} else {
+		$login = $operator['vclogin'];
+	}
 	$email = getparam('email');
 	$password = getparam('password');
 	$passwordConfirm = getparam('passwordConfirm');
@@ -128,6 +132,7 @@ $canmodify = ($opId == $operator['operatorid'] && is_capable($can_modifyprofile,
 
 $page['stored'] = isset($_GET['stored']);
 $page['canmodify'] = $canmodify ? "1" : "";
+$page['canchangelogin'] = is_capable($can_administrate, $operator);
 $page['needChangePassword'] = $operator['vcpassword'] == md5('');
 
 prepare_menu($operator);
diff --git a/src/messenger/webim/view/agent.php b/src/messenger/webim/view/agent.php
index 23912f81..1049139a 100644
--- a/src/messenger/webim/view/agent.php
+++ b/src/messenger/webim/view/agent.php
@@ -59,7 +59,7 @@ require_once('inc_errors.php');
 		<div class="field">
 			<div class="flabel"><?php echo getlocal('form.field.login') ?><span class="required">*</span></div>
 			<div class="fvalue">
-				<input type="text" name="login" size="40" value="<?php echo form_value('login') ?>" class="formauth"<?php echo $page['canmodify'] ? "" : " disabled=\"disabled\"" ?>/>
+				<input type="text" name="login" size="40" value="<?php echo form_value('login') ?>" class="formauth"<?php echo $page['canchangelogin'] ? "" : " disabled=\"disabled\"" ?>/>
 			</div>
 			<div class="fdescr"> &mdash; <?php echo getlocal('form.field.login.description') ?></div>
 			<br clear="all"/>