Fix for User and Login objects