Fixed some issues regarding edit/create profile