Tried to resolve issues with Edit Account Page but need to watch Session Service and update - fix later