Fixed users bugs