Merge functional changes into UI

Merged Haris Ahmed Ayub requested to merge auth into main

Created by: ayubharis

Merge request reports