modulate calendar class further
fix login error