diff --git a/Oqtane.Client/Modules/Admin/Files/Index.razor b/Oqtane.Client/Modules/Admin/Files/Index.razor
index 677b117b..489587a8 100644
--- a/Oqtane.Client/Modules/Admin/Files/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Files/Index.razor
@@ -52,7 +52,7 @@
     public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
 
     List<Folder> Folders;
-    int folderid;
+    int folderid = -1;
     List<File> Files;
     Uri uri;
 
@@ -61,7 +61,7 @@
         try
         {
             Folders = await FolderService.GetFoldersAsync(PageState.Site.SiteId);
-            if (Folders.Count > 0)
+            if (folderid == -1 && Folders.Count > 0)
             {
                 folderid = Folders[0].FolderId;
                 await GetFiles();
diff --git a/Oqtane.Client/Modules/Admin/Users/Add.razor b/Oqtane.Client/Modules/Admin/Users/Add.razor
index 781e958f..11b8b1b9 100644
--- a/Oqtane.Client/Modules/Admin/Users/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Users/Add.razor
@@ -48,14 +48,6 @@
                 <input class="form-control" @bind="@displayname" />
             </td>
         </tr>
-        <tr>
-            <td>
-                <label for="Name" class="control-label">Photo: </label>
-            </td>
-            <td>
-                <FileManager @ref="filemanager" />
-            </td>
-        </tr>
 
         @foreach (Profile profile in profiles)
         {
@@ -91,7 +83,6 @@
     string confirm = "";
     string email = "";
     string displayname = "";
-    FileManager filemanager;
     List<Profile> profiles;
     Dictionary<string, string> settings;
     string category = "";
@@ -125,11 +116,6 @@
                     user.Email = email;
                     user.DisplayName = string.IsNullOrWhiteSpace(displayname) ? username : displayname;
                     user.PhotoFileId = null;
-                    int photofileid = filemanager.GetFileId();
-                    if (photofileid != -1)
-                    {
-                        user.PhotoFileId = photofileid;
-                    }
 
                     user = await UserService.AddUserAsync(user);
 
diff --git a/screenshot6.png b/screenshot6.png
new file mode 100644
index 00000000..df206652
Binary files /dev/null and b/screenshot6.png differ