Fixed password being passed into file browser
Merging conflicts