diff --git a/private/avatars/rocketcat.png b/private/avatars/rocketcat.png
new file mode 100644
index 00000000000..caf940d6b04
Binary files /dev/null and b/private/avatars/rocketcat.png differ
diff --git a/server/startup/initialData.coffee b/server/startup/initialData.coffee
index 7840064f439..fa806674792 100644
--- a/server/startup/initialData.coffee
+++ b/server/startup/initialData.coffee
@@ -5,6 +5,25 @@ Meteor.startup ->
 			RocketChat.models.Rooms.createWithIdTypeAndName 'GENERAL', 'c', 'general',
 				default: true
 
+		if not RocketChat.models.Users.findOneByUsername('rocket.cat')?
+			userId = RocketChat.models.Users.create
+				name: "Rocket.Cat"
+				username: 'rocket.cat'
+				status: "offline"
+				statusDefault: "offline"
+				utcOffset: 0
+				active: true
+				bot: true
+
+			rs = RocketChatFile.bufferToStream new Buffer(Assets.getBinary('avatars/rocketcat.png'), 'utf8')
+			RocketChatFileAvatarInstance.deleteFile "rocket.cat.jpg"
+			ws = RocketChatFileAvatarInstance.createWriteStream "rocket.cat.jpg", 'image/png'
+			ws.on 'end', Meteor.bindEnvironment ->
+				RocketChat.models.Users.setAvatarOrigin userId, 'local'
+
+			rs.pipe(ws)
+
+
 		if process.env.ADMIN_EMAIL? and process.env.ADMIN_PASS?
 			re = /^([\w-]+(?:\.[\w-]+)*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$/i
 			if re.test process.env.ADMIN_EMAIL