Lock feature does not work as intended

Other ConnectEBT issues: