diff --git a/Home.md b/Home.md
index e9ef51f..c710da4 100644
--- a/Home.md
+++ b/Home.md
@@ -9,8 +9,7 @@
     * [[Terminology|Introduction#terminology]]
 * [[User documentation]]
     * [[Student|User documentation#student]]
-    * [[Lecturer|User documentation#lecturer]]
-    * [[Author of exercise|User documentation#author-of-exercise]]
+    * [[Group supervisor|User documentation#group-supervisor]]
     * [[Administrator|User documentation#administrator]]
 * [[Overall architecture]]
     * [[Description|Overall architecture#description]]
diff --git a/User-documentation.md b/User-documentation.md
index a2a94b7..72204ba 100644
--- a/User-documentation.md
+++ b/User-documentation.md
@@ -2,8 +2,68 @@
 
 ## Student
 
-## Lecturer
+### Authentication
 
-## Author of exercise
+#### Registration
+// TODO: normal, cas
 
-## Administrator
\ No newline at end of file
+#### Login
+
+#### Forgotten password
+// TODO: only for normal
+
+### User profile
+
+#### Update user profile
+// TODO: change of password included in this
+
+#### Email notifications
+// TODO: not implemented yet
+
+### Groups
+
+#### Group membership
+// TODO: list of groups, join, leave
+
+#### Assigned exercises
+// TODO: deadlines, etc
+
+#### Submission of assignment and its evaluation
+
+#### Results of submission
+// TODO: points, bonus point, etc
+
+## Group supervisor
+
+### Groups
+
+#### Management
+// TODO: create sub-group, delete sub-group, change parameters of group
+
+#### Assignment of exercise
+// TODO: howto assign, de-assign
+
+#### Students submissions
+// TODO: list of them, submitted files, etc
+
+### Exercises
+// TODO: not implemented yet
+
+#### Create exercise
+
+#### Fork exercise
+
+#### Update exercise
+
+
+## Administrator
+
+### Groups
+
+### Users management
+
+#### Roles in ReCodEx
+// TODO: some description what is there
+
+#### Delete user
+// TODO: probably one and only action which can admin do with users
\ No newline at end of file