Merge login, fix image