Limit number of registration attempts 2

Change-Id: I73706697ce68c836e1fd2ee53b3ef80de2f4090d