Refine app login organisation