Extra if condition step in actions

[David_Gabler]

Instead, vote on this Better and more consistent IF THEN logic

I believe that is part of that request (and needs more votes)!