diff --git a/ChangeLog b/ChangeLog
index 7e1f515dd..cd995573c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-14  Alexey Shchepin  <alexey@sevcom.net>
+
+	* src/ejabberd_service.erl: Answer "Bad Request" on unknown tags
+
 2003-02-13  Alexey Shchepin  <alexey@sevcom.net>
 
 	* src/ejabberd_c2s.erl: Bugfix: close socket when stream is closed
diff --git a/src/ejabberd.cfg b/src/ejabberd.cfg
index 3705030ac..c119b6d3a 100644
--- a/src/ejabberd.cfg
+++ b/src/ejabberd.cfg
@@ -42,7 +42,7 @@
 	  % [{access, c2s}, {ssl, [{certfile, "./ssl.pem"}]}]},
           {5269, ejabberd_s2s_in,  start, []},
           {8888, ejabberd_service, start,
-	   [{host, "asd.e.localhost", [{password, "asdqwe"}]}]}
+	   [{host, "conference.e.localhost", [{password, "asdqwe"}]}]}
          ]}.
 
 % This value (5569) is only for debugging, must be 5269
diff --git a/src/ejabberd_service.erl b/src/ejabberd_service.erl
index 455885f50..116780d4c 100644
--- a/src/ejabberd_service.erl
+++ b/src/ejabberd_service.erl
@@ -173,6 +173,8 @@ stream_established({xmlstreamelement, El}, StateData) ->
        (ToJID /= error) and (FromJID /= error) ->
 	    ejabberd_router:route(FromJID, ToJID, El);
        true ->
+	    Err = jlib:make_error_reply(El, "400", "Bad Request"),
+	    send_element(StateData#state.socket, Err),
 	    error
     end,
     {next_state, stream_established, StateData};