diff --git a/Makefile b/Makefile
index 0668aed..808cb4c 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ INCLUDES	:=	inc
 EXEFS_SRC	:=	exefs_src
 APP_TITLE   :=  JKSV
 APP_AUTHOR  :=  JK
-APP_VERSION :=  05.14.2020
+APP_VERSION :=  05.15.2020
 ROMFS	    :=	romfs
 
 #---------------------------------------------------------------------------------
diff --git a/src/data.cpp b/src/data.cpp
index 66bdcbc..9bb83af 100644
--- a/src/data.cpp
+++ b/src/data.cpp
@@ -579,15 +579,15 @@ namespace data
                     break;
 
                 case FsSaveDataType_Bcat:
-                    info.uid = util::u128ToAccountUID(1);
+                    info.uid = util::u128ToAccountUID(2);
                     break;
 
                 case FsSaveDataType_Device:
-                    info.uid = util::u128ToAccountUID(2);
+                    info.uid = util::u128ToAccountUID(3);
                     break;
             }
 
-            if(!blacklisted(info.application_id) && !blacklisted(info.save_data_id))
+            if(!blacklisted(info.application_id) && !blacklisted(info.save_data_id) && accountSystemSaveCheck(info))
             {
                 //We have all users and icons. This *should* be safe
                 int u = getUserIndex(info.uid);
@@ -597,10 +597,7 @@ namespace data
                     newData.setFav(true);
 
                 if(newData.isMountable(data::users[u].getUID()) || !forceMount)
-                {
                     users[u].titles.push_back(newData);
-                    fs::unmountSave();
-                }
             }
         }
         delete dat;
diff --git a/src/ui.cpp b/src/ui.cpp
index ddd7313..3969a42 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -10,7 +10,7 @@
 #include "util.h"
 #include "file.h"
 
-#define VER_STRING "v. 05.14.2020"
+#define VER_STRING "v. 05.15.2020"
 
 //Don't waste time drawing top and bottom over and over
 //guide graphics are to save cpu drawing that over and over with alpha