diff --git a/example/lib/advanced_options_page.dart b/example/lib/advanced_options_page.dart
index 212a15a8..e07afefd 100644
--- a/example/lib/advanced_options_page.dart
+++ b/example/lib/advanced_options_page.dart
@@ -7,6 +7,8 @@ import 'package:stream_chat_flutter/stream_chat_flutter.dart';
 
 import 'main.dart';
 import 'notifications_service.dart';
+import 'choose_user_page.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 
 class AdvancedOptionsPage extends StatefulWidget {
   @override
@@ -285,6 +287,20 @@ class _AdvancedOptionsPageState extends State<AdvancedOptionsPage> {
                               if (!kIsWeb) {
                                 initNotifications(client);
                               }
+
+                              final secureStorage = FlutterSecureStorage();
+                              secureStorage.write(
+                                key: kStreamApiKey,
+                                value: apiKey,
+                              );
+                              secureStorage.write(
+                                key: kStreamUserId,
+                                value: userId,
+                              );
+                              secureStorage.write(
+                                key: kStreamToken,
+                                value: userToken,
+                              );
                             } catch (e) {
                               var errorText = 'Error connecting, retry';
                               if (e is Map) {
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index 491dbbb7..7c76b15f 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -1,6 +1,6 @@
 name: example
 description: A new Flutter project.
-version: 1.0.73+75
+version: 1.0.74+76
 
 environment:
   sdk: ">=2.2.2 <3.0.0"
diff --git a/lib/src/channel_preview.dart b/lib/src/channel_preview.dart
index 3c9eeace..26f68812 100644
--- a/lib/src/channel_preview.dart
+++ b/lib/src/channel_preview.dart
@@ -104,7 +104,7 @@ class ChannelPreview extends StatelessWidget {
                                         .isAfter(channel
                                             .state.lastMessage.createdAt))
                                     .length ==
-                                (channel.memberCount ?? 0) - 1,
+                                (channel.memberCount ?? 0),
                           ),
                         );
                       }
diff --git a/lib/src/message_widget.dart b/lib/src/message_widget.dart
index 86479ebe..280de349 100644
--- a/lib/src/message_widget.dart
+++ b/lib/src/message_widget.dart
@@ -426,12 +426,13 @@ class _MessageWidgetState extends State<MessageWidget> {
           top: 0,
           child: Material(
             color: Colors.white,
+            clipBehavior: Clip.antiAlias,
             shape: CircleBorder(),
             child: Padding(
               padding: const EdgeInsets.all(1.0),
               child: UserAvatar(
                 user: e.user,
-                constraints: BoxConstraints.loose(Size.fromRadius(16)),
+                constraints: BoxConstraints.loose(Size.fromRadius(8)),
                 showOnlineStatus: false,
               ),
             ),
diff --git a/lib/src/user_avatar.dart b/lib/src/user_avatar.dart
index 2e1f3e0e..756252cc 100644
--- a/lib/src/user_avatar.dart
+++ b/lib/src/user_avatar.dart
@@ -40,6 +40,7 @@ class UserAvatar extends StatelessWidget {
     final streamChatTheme = StreamChatTheme.of(context);
 
     Widget avatar = ClipRRect(
+      clipBehavior: Clip.antiAlias,
       borderRadius: borderRadius ??
           streamChatTheme.ownMessageTheme.avatarTheme.borderRadius,
       child: Container(