diff --git a/.todo b/.todo
index 2d04c17..ae0cdf4 100644
--- a/.todo
+++ b/.todo
@@ -7,3 +7,7 @@
 //TODO: Check and fix time based automation
 //TODO: 404 same like in ENergo COunter Project
 //TODO: @FILIP Fix Editation of all Automations
+//TODO: @FILIP test if registration work without an isuu even with notification
+//TODO: Fix Default Room selection
+//TODO: Fix User Delete button
+//TODO: Fix new add email form
diff --git a/app/class/UserManager.php b/app/class/UserManager.php
index b2508e5..d19bda1 100644
--- a/app/class/UserManager.php
+++ b/app/class/UserManager.php
@@ -21,6 +21,11 @@ class UserManager
 		}
 	}
 
+	public function getAvatarUrl(){
+		$email = self::getUserData('email');
+		return 'https://secure.gravatar.com/avatar/' . md5( strtolower( trim( $email ) ) );
+	}
+
 	public function login ($username, $password, $rememberMe) {
 		try {
 			if ($user = Db::loadOne ('SELECT * FROM users WHERE LOWER(username)=LOWER(?)', array ($username))) {
@@ -104,7 +109,6 @@ class UserManager
 	public static function getUserData ($type, $userId = '') {
 		if ($userId == '') {
 			$userId = $_SESSION['user']['id'];
-			echo 'no user id';
 		}
 		$user = Db::loadOne ('SELECT ' . $type . ' FROM users WHERE user_id=?', array ($userId));
 		return $user[$type];
diff --git a/app/templates/setting.phtml b/app/templates/setting.phtml
index ae5588e..134b618 100644
--- a/app/templates/setting.phtml
+++ b/app/templates/setting.phtml
@@ -23,6 +23,7 @@
 		<div class="col-md-9 main-body">
 			<div class="col-12 col-sm-9 mx-auto mt-4">
 				<h4 class="mb-4">
+
 					<?php $LANGMNG->echo('t_pageAfterLogIn') ?>
 				</h4>
 				<form method="post" enctype="multipart/form-data">
@@ -39,6 +40,19 @@
 			</form>
 			<div class="col-12 col-sm-9 mx-auto mt-4">
 				<h4 class="mb-4"><?php $LANGMNG->echo('t_profile') ?></h4>
+				<div class="field">
+					<div class="label"><?php $LANGMNG->echo('l_userAvatar') ?>:</div>
+					<img src="<?php echo $USERAVATARURL; ?>" />
+					<div class="label">* providet by Gavatar</div>
+				</div>
+				<div class="field">
+					<div class="label"><?php $LANGMNG->echo('l_userName') ?>:</div>
+					<input class="input" value="<?php echo $USERNAME; ?>" disabled>
+				</div>
+				<div class="field">
+					<div class="label"><?php $LANGMNG->echo('l_userEmail') ?>:</div>
+					<input class="input" value="<?php echo $USEREMAIL; ?>" disabled>
+				</div>
 				<div class="field">
 					<a href="logout" class="button is-primary"><?php $LANGMNG->echo('b_logOut') ?></a>
 				</div>
diff --git a/app/views/Setting.php b/app/views/Setting.php
index cde136c..76b28b3 100644
--- a/app/views/Setting.php
+++ b/app/views/Setting.php
@@ -24,7 +24,7 @@ class Setting extends Template
 
 		$template = new Template('setting');
 		$template->prepare('baseDir', BASEDIR);
-			$template->prepare('debugMod', DEBUGMOD);
+		$template->prepare('debugMod', DEBUGMOD);
 		$template->prepare('title', 'Automation');
 		$template->prepare('langMng', $langMng);
 		$template->prepare('automations', $automations);
@@ -32,6 +32,10 @@ class Setting extends Template
 		$users = $userManager->getUsers();
 		$template->prepare('users', $users);
 
+		$template->prepare('userName', $userManager->getUserData('username'));
+		$template->prepare('userEmail', $userManager->getUserData('email'));
+		$template->prepare('userAvatarUrl', $userManager->getAvatarUrl());
+
 		if ($userManager->getUserData('ota') == ''){
 			$ga = new PHPGangsta_GoogleAuthenticator();
 			$otaSecret = $ga->createSecret();