diff --git a/packages/rocketchat-lib/settings/server/startup.coffee b/packages/rocketchat-lib/settings/server/startup.coffee
index a7d99b6fef3..3fb62ca8cc8 100644
--- a/packages/rocketchat-lib/settings/server/startup.coffee
+++ b/packages/rocketchat-lib/settings/server/startup.coffee
@@ -28,4 +28,4 @@ Meteor.startup ->
 	RocketChat.settings.add 'Meta:fb:app_id', '', { type: 'string', group: 'Meta' }
 	RocketChat.settings.add 'Meta:robots', '', { type: 'string', group: 'Meta' }
 	RocketChat.settings.add 'Meta:google-site-verification', '', { type: 'string', group: 'Meta' }
-	RocketChat.settings.add 'Meta:msvalidate.01', '', { type: 'string', group: 'Meta' }
\ No newline at end of file
+	RocketChat.settings.add 'Meta:msvalidate.01', '', { type: 'string', group: 'Meta' }
diff --git a/server/startup/initialData.coffee b/server/startup/initialData.coffee
index 59f4c59412c..bb0bbc7364b 100644
--- a/server/startup/initialData.coffee
+++ b/server/startup/initialData.coffee
@@ -11,18 +11,28 @@ Meteor.startup ->
 				name: 'general'
 				msgs: 0
 
+		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
+				if not Meteor.users.findOne({ admin: true })?
+					if not Meteor.users.findOne({ "emails.address": process.env.ADMIN_EMAIL })
+						console.log 'Inserting admin user'.red
+						console.log "email: #{process.env.ADMIN_EMAIL} | password: #{process.env.ADMIN_PASS}".red
 
-		# if not Meteor.users.findOne()?
-		# 	console.log 'Inserting user admin'.red
-		# 	console.log 'email: admin@admin.com | password: admin'.red
+						id = Meteor.users.insert
+							createdAt: new Date
+							emails: [
+								address: process.env.ADMIN_EMAIL
+								verified: true
+							],
+							name: 'Admin'
+							avatarOrigin: 'none'
+							admin: true
 
-		# 	id = Meteor.users.insert
-		# 		createdAt: new Date
-		# 		emails: [
-		# 			address: 'admin@admin.com'
-		# 			verified: true
-		# 		],
-		# 		name: 'Admin'
-		# 		avatarOrigin: 'none'
-
-		# 	Accounts.setPassword id, 'admin'
+						Accounts.setPassword id, process.env.ADMIN_PASS
+					else
+						console.log 'E-mail exists; ignoring environment variables ADMIN_EMAIL and ADMIN_PASS'.red
+				else
+					console.log 'Admin user exists; ignoring environment variables ADMIN_EMAIL and ADMIN_PASS'.red
+			else
+				console.log 'E-mail provided is invalid; ignoring environment variables ADMIN_EMAIL and ADMIN_PASS'.red
\ No newline at end of file