diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index c46e77ca3..09b98af3e 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -414,7 +414,8 @@ wait_for_feature_request({xmlstreamelement, El}, StateData) ->
 		    ?INFO_MSG("(~w) Accepted authentication for ~s",
 			      [StateData#state.socket, U]),
 		    {next_state, wait_for_stream,
-		     StateData#state{authentificated = true,
+		     StateData#state{streamid = new_id(),
+				     authentificated = true,
 				     user = U
 				    }};
 		{continue, ServerOut, NewSASLState} ->
@@ -444,6 +445,7 @@ wait_for_feature_request({xmlstreamelement, El}, StateData) ->
 	    {next_state, wait_for_stream,
 	     StateData#state{sockmod = tls,
 			     socket = TLSSocket,
+			     streamid = new_id(),
 			     tls_enabled = true
 			    }};
 	_ ->
@@ -500,7 +502,8 @@ wait_for_sasl_response({xmlstreamelement, El}, StateData) ->
 		    ?INFO_MSG("(~w) Accepted authentication for ~s",
 			      [StateData#state.socket, U]),
 		    {next_state, wait_for_stream,
-		     StateData#state{authentificated = true,
+		     StateData#state{streamid = new_id(),
+				     authentificated = true,
 				     user = U
 				    }};
 		{continue, ServerOut, NewSASLState} ->