                 for topic in req.body.pushTopics
                     eventName = topic
                     if req.param("steedosId")?
-                        eventName = eventName + "|" + req.param("steedosId").replace("@", "_").replace(".", "_")
+                        eventName = eventName + "|" + req.param("steedosId").replace(/[@\-\.]/g, "_")
                     events[eventName] = {}
                 req.subscriber.addSubscriptions events, (r) ->
                     generateResponse(req, res, req.subscriber)

                for topic in req.body.pushTopics
                    eventName = topic
                    if req.param("steedosId")?
                        eventName = eventName + "|" + req.param("steedosId").replace("@", "_").replace(".", "_")
                    events[eventName] = {}
                req.subscriber.removeSubscriptions events, (r) ->
                    generateResponse(req, res, req.subscriber)

                        for topic in req.body.pushTopics
                            eventName = topic
                            if req.param("steedosId")?
                                eventName = eventName + "|" + req.param("steedosId").replace(/[@\-\.]/g, "_")
                            events[eventName] = {}
                        subscriber.addSubscriptions events, (r) ->
                            generateResponse(req, res, subscriber)
