Profile edit fixes
Profile edit fixes