Index: typo3/sysext/setup/mod/locallang.xml
===================================================================
--- typo3/sysext/setup/mod/locallang.xml	(revision 5105)
+++ typo3/sysext/setup/mod/locallang.xml	(working copy)
@@ -94,6 +94,7 @@
 			<label index="newPasswordAgain">New password, again</label>
 			<label index="newPassword_ok">Password was updated</label>
 			<label index="newPassword_failed">Password was NOT updated because you didn't enter the same password twice.</label>
+			<label index="openid">OpenID</label>
 			<label index="adminFunctions">Admin functions</label>
 		</languageKey>
 	</data>
Index: typo3/sysext/setup/mod/index.php
===================================================================
--- typo3/sysext/setup/mod/index.php	(revision 5105)
+++ typo3/sysext/setup/mod/index.php	(working copy)
@@ -188,6 +188,8 @@
 					|| $be_user_data['realName']!=$BE_USER->user['realName']
 					|| (strlen($be_user_data['password1'])==32
 							&& !strcmp($be_user_data['password1'],$be_user_data['password2']))
+					|| (t3lib_extMgm::isLoaded('openid') 
+							&& $be_user_data['tx_openid_openid'] != $BE_USER->user['tx_openid_openid'])
 					)	{
 				$storeRec = array();
 				$BE_USER->user['realName'] = $storeRec['be_users'][$BE_USER->user['uid']]['realName'] = substr($be_user_data['realName'],0,80);
@@ -196,6 +198,10 @@
 					$BE_USER->user['password'] = $storeRec['be_users'][$BE_USER->user['uid']]['password'] = $be_user_data['password1'];
 					$this->PASSWORD_UPDATED = 1;
 				}
+				
+				if (t3lib_extMgm::isLoaded('openid')) {
+					$BE_USER->user['tx_openid_openid'] = $storeRec['be_users'][$BE_USER->user['uid']]['tx_openid_openid'] = substr($be_user_data['tx_openid_openid'],0,80);
+				}
 
 					// Make instance of TCE for storing the changes.
 				$tce = t3lib_div::makeInstance('t3lib_TCEmain');
@@ -352,6 +358,15 @@
 		$code[$i][2] = '<input id="field_newPasswordAgain" type="password" name="ext_beuser[password2]" value=""'.$GLOBALS['TBE_TEMPLATE']->formWidth(20).' onchange="this.value=this.value?MD5(this.value):\'\'" />';
 		$code[$i++][3] = $displayFullText ? '&nbsp;' : $this->getCSH('newPasswordAgain');
 
+		if (t3lib_extMgm::isLoaded('openid')) {
+			if ($displayFullText) {
+				$code[$i++][1] = $this->getCSH('openid');
+			}
+			$code[$i][1] = $this->setLabel('openid');
+			$code[$i][2] = '<input id="field_tx_openid_openid" type="text" name="ext_beuser[tx_openid_openid]" value="'.htmlspecialchars($BE_USER->user['tx_openid_openid']).'"'.$GLOBALS['TBE_TEMPLATE']->formWidth(20).' />';
+			$code[$i++][3] = $displayFullText ? '&nbsp;' : $this->getCSH('openid');
+		}
+		
 			// Languages:
 		$opt = array();
 		$opt['000000000']='
Index: typo3/sysext/setup/locallang_csh_mod.xml
===================================================================
--- typo3/sysext/setup/locallang_csh_mod.xml	(revision 5105)
+++ typo3/sysext/setup/locallang_csh_mod.xml	(working copy)
@@ -95,6 +95,9 @@
 			<label index="option_newPassword.details">The passwords are encrypted to an MD5 hash when you leave the field so no plain text password is sent over the wire.</label>
 			<label index="option_newPasswordAgain.alttitle">Change password, confirm</label>
 			<label index="option_newPasswordAgain.description">Confirm the new password by entering it again, exactly like above. If the two new passwords do not match, the password will not be changed.</label>
+			<label index="option_openid.alttitle">Login using OpenID</label>
+			<label index="option_openid.description">You can use OpenID to login into TYPO3 Backend instead of using your username and password.</label>
+			<label index="option_openid.details">You need an OpenID from any OpenID provider. More information can be found on http://openid.net</label>
 			<label index="reset.alttitle">Reset all Values to default</label>
 			<label index="reset.description">If you select this option all settings in this module will be reset to the default settings of the system.</label>
 			<label index="reset.details">This does not apply to user name, email and password settings of course.</label>