diff --git a/BookAStar/BookAStar.Droid/Helpers/SimpleJsonPostMethod.cs b/BookAStar/BookAStar.Droid/Helpers/SimpleJsonPostMethod.cs
index 11b3ca6c..2b78773e 100644
--- a/BookAStar/BookAStar.Droid/Helpers/SimpleJsonPostMethod.cs
+++ b/BookAStar/BookAStar.Droid/Helpers/SimpleJsonPostMethod.cs
@@ -85,8 +85,7 @@ namespace Yavsc.Helpers
 		public async Task<JsonValue> InvokeJson(object query)
         {
             JsonValue jsonDoc = null;
-            try
-            {
+
                 using (Stream streamQuery = request.GetRequestStream())
                 {
                     using (StreamWriter writer = new StreamWriter(streamQuery))
@@ -102,7 +101,9 @@ namespace Yavsc.Helpers
                             jsonDoc = await Task.Run(() => JsonObject.Load(stream));
                     }
                     response.Close();
-                }
+            }
+            try
+            {
             }
             catch (WebException ex)
             {
diff --git a/BookAStar/BookAStar/App.xaml.cs b/BookAStar/BookAStar/App.xaml.cs
index ed96d59b..e352f99a 100644
--- a/BookAStar/BookAStar/App.xaml.cs
+++ b/BookAStar/BookAStar/App.xaml.cs
@@ -33,7 +33,6 @@ namespace BookAStar
         public static IPlatform PlatformSpecificInstance { get; set; }
         public static string AppName { get; set; }
 
-
         [Obsolete("Instead using this, use new static properties.")]
         public static App CurrentApp { get { return Current as App; } }
        
@@ -64,7 +63,7 @@ namespace BookAStar
             MainSettings.UserChanged += MainSettings_UserChanged;
             CrossConnectivity.Current.ConnectivityChanged += (conSender, args) =>
             { App.IsConnected = args.IsConnected; };
-            SetupHubConnection();
+            MainSettings_UserChanged(this, null);
             if (CrossConnectivity.Current.IsConnected)
                 StartHubConnection();
         }
@@ -341,20 +340,21 @@ namespace BookAStar
                     }
                     );
             });
-            MainSettings_UserChanged(this, null);
         }
 
         private void MainSettings_UserChanged(object sender, EventArgs e)
         {
             if (MainSettings.CurrentUser == null)
             {
-                chatHubConnection.Headers.Clear();
+                chatHubConnection.Dispose();
+                chatHubConnection = null;
+                chatHubProxy = null;
             }
             else
             {
                 var token = MainSettings.CurrentUser.YavscTokens.AccessToken;
-                chatHubConnection.Headers.Add(
-                    "Authorization", $"Bearer {token}");
+                SetupHubConnection();
+                chatHubConnection.Headers.Add("Authorization", $"Bearer {token}");
             }
         }
 
diff --git a/BookAStar/BookAStar/Pages/UserProfile/UserProfilePage.xaml b/BookAStar/BookAStar/Pages/UserProfile/UserProfilePage.xaml
index ba506934..790caa89 100644
--- a/BookAStar/BookAStar/Pages/UserProfile/UserProfilePage.xaml
+++ b/BookAStar/BookAStar/Pages/UserProfile/UserProfilePage.xaml
@@ -18,6 +18,9 @@
                                          HorizontalTextAlignment="Center"
                                          LineBreakMode="WordWrap" XAlign="Center"
            ></Label>
+        <Image Source="{Binding User.AvatarSource}"></Image>
+        <!--
+        
         <controls:ImageButton
           x:Name="AvatarButton"
           BackgroundColor="#01abdf"
@@ -28,7 +31,8 @@
           Text="{Binding UserName}"
           TextColor="#ffffff"
           WidthRequest="175"
-          Source="{Binding Avatar}" />
+          Source="{Binding User.AvatarSource}" />
+        -->
         <StackLayout Orientation="Horizontal">
           <Label Text="Recevoir les notifications push" StyleClass="Header" />
           <Switch IsToggled="{Binding ReceivePushNotifications, Mode=TwoWay}"
diff --git a/BookAStar/BookAStar/Pages/UserProfile/UserProfilePage.xaml.cs b/BookAStar/BookAStar/Pages/UserProfile/UserProfilePage.xaml.cs
index fc1f780d..7c9cd5a3 100644
--- a/BookAStar/BookAStar/Pages/UserProfile/UserProfilePage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/UserProfile/UserProfilePage.xaml.cs
@@ -1,4 +1,5 @@
 
+using BookAStar.ViewModels.UserProfile;
 using System;
 
 using Xamarin.Forms;
@@ -10,7 +11,8 @@ namespace BookAStar.Pages.UserProfile
         public UserProfilePage()
         {
             InitializeComponent();
-            AvatarButton.Clicked += AvatarButton_Clicked;
+          // AvatarButton.Clicked += AvatarButton_Clicked;
+           
         }
 
         private void AvatarButton_Clicked (object sender, EventArgs e)
diff --git a/BookAStar/BookAStar/ViewModels/UserProfile/UserProfileViewModel.cs b/BookAStar/BookAStar/ViewModels/UserProfile/UserProfileViewModel.cs
index 2873d130..5e18bab3 100644
--- a/BookAStar/BookAStar/ViewModels/UserProfile/UserProfileViewModel.cs
+++ b/BookAStar/BookAStar/ViewModels/UserProfile/UserProfileViewModel.cs
@@ -16,6 +16,14 @@ namespace BookAStar.ViewModels.UserProfile
 
     internal class UserProfileViewModel : ViewModel
     {
+        public bool IsAPerformer
+        {
+            get
+            {
+                return User?.Roles.Contains("Performer") ?? false;
+            }
+            
+        }
         public string UserFilesLabel
         {
             get; set;