Cosmetics
Clean up the embedded/stand-alone logic
Fix wrong pw popup