Fix system form to display correct type [story:41800395]