MOBILE-453 Fix previous commits

rewrite to be else if ( ... ) as there's no point ( in this case ) for
going:
if {} else { if {} }