FTUE - Fixes optional email registration step always being mandatory