Improved: user handling and locking system