Modified login procedure and limit results by default