Adding back prompt for emulator but allowing empty password