Temporary GD changes, fixed login