Fixed issues

When 

Workspaces

 and 

BBM Enterprise

 services were both assigned to a user, the 

Workspaces

 service must have been removed before the 

BBM Enterprise

 service can be removed. (JI 2632540)