fixed login structure