Updated users controller again, more bugs. Now - less bugs.