Fixes for fs detection and user loggin