Simplify correct_user logic and distribute

In response to Issue #6