Fixed user race condition
Merge branch 'feature-refactor-edittab' of https://github.com/JustDuckItAll/wpi-suite into feature-refactor-edittab