Remove finished TODOs
Issue fix - staff password confirmation
Add todos after CR
ToDo fixes
Remove TODOs
Merge pull request #4 from vinsol/staff-fix

Staff fix
resolve merge conflict