remove username check to get rid of super call altogether