diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 3c03801b23..11b348949d 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -96,6 +96,7 @@
 		<li>[Change] Sort the tables at the database table backup screen</li>
 		<li>[Fix] Update correct theme for cached styles in style.php (Bug #25805)</li>
 		<li>[Fix] Also add PHPBB_INSTALLED check to download/file.php for inline avatar delivery</li>
+		<li>[Fix] Unable to login to some jabber server, reverted previous change (Bug #25095)</li>
 	</ul>
 
 	<a name="v300"></a><h3>1.ii. Changes since 3.0.0</h3>
diff --git a/phpBB/includes/functions_jabber.php b/phpBB/includes/functions_jabber.php
index 7633c10be9..6cae90d1c2 100644
--- a/phpBB/includes/functions_jabber.php
+++ b/phpBB/includes/functions_jabber.php
@@ -399,12 +399,13 @@ class jabber
 				$second_time = isset($this->session['id']);
 				$this->session['id'] = $xml['stream:stream'][0]['@']['id'];
 
+				/** Currently commented out due to problems with some jabber server - reason unknown
 				if ($second_time)
 				{
 					// If we are here for the second time after TLS, we need to continue logging in
 					$this->login();
 					return;
-				}
+				}*/
 
 				// go on with authentication?
 				if (isset($this->features['stream:features'][0]['#']['bind']) || !empty($this->session['tls']))