Improved: user handling and locking system
Merge branch 'improvements'