Fix manage your settings functionality