Fix handling of missing password