diff --git a/ChatServiceApp/funcs.py b/ChatServiceApp/funcs.py
index d31483b..343250e 100644
--- a/ChatServiceApp/funcs.py
+++ b/ChatServiceApp/funcs.py
@@ -50,13 +50,17 @@ def get_update_chat_Dict(data):
         receiver = None
         if 'receiver' in data and data['receiver']:
             receiver = User.objects.get(id=data['receiver'])
-
-        if data['sender'] == data['cur_user']:
-            context_Dict.update({'user': sender})
-        else:
-            context_Dict.update({'user': receiver})
-
-        context_Dict.update({'cur_receiver': receiver})
+        #
+        # if data['sender'] == data['cur_user']:
+        #     context_Dict.update({'user': sender})
+        # else:
+        #     context_Dict.update({'user': receiver})
+        #
+        # context_Dict.update({'cur_receiver': receiver})
+        context_Dict.update({
+            'cur_receiver': sender,
+            'user': receiver
+        })
 
         required_beep = data['required_beep']
 
diff --git a/GeneralApp/funcs.py b/GeneralApp/funcs.py
index 815796f..61cc0d8 100644
--- a/GeneralApp/funcs.py
+++ b/GeneralApp/funcs.py
@@ -6,9 +6,16 @@ def get_inter_Dict(user):
     from SubscribesApp.funcs import get_cur_user_subscribe
     user_subscribe = get_cur_user_subscribe(user)
 
+
     Dict = {
         'user_subscribe': user_subscribe,
+        'prod': True
     }
+
+    if settings.WS_ADDRESS == 'localhost:8000':
+        Dict.update({'prod': False})
+
+
     from PushMessages.views import get_key_Dict
     Dict.update(get_key_Dict())
 
diff --git a/templates/tb_base.html b/templates/tb_base.html
index bfba730..a736a1a 100644
--- a/templates/tb_base.html
+++ b/templates/tb_base.html
@@ -28,7 +28,11 @@
         <script>
 
             {#var user_id = {{ user.id }}#}
-            ws_url = `ws://{% get_ws_address %}/ws/socket-server/?user_id={{ user.id }}`;
+            {% if prod %}
+                ws_url = `wss://{% get_ws_address %}/ws/socket-server/?user_id={{ user.id }}`;
+            {% else %}
+                ws_url = `ws://{% get_ws_address %}/ws/socket-server/?user_id={{ user.id }}`;
+            {% endif %}
             var chatSocket;
             init_ws()
             const beep = new Audio('/static/sounds/beep_2.mp3')