diff --git a/src/screens/CreateScreen.js b/src/screens/CreateScreen.js
index 630e969..8dec631 100644
--- a/src/screens/CreateScreen.js
+++ b/src/screens/CreateScreen.js
@@ -4,9 +4,7 @@ import {
   FormControl,
   FormLabel,
   Heading,
-  Input,
-  Select,
-  useToast,
+  Input, useToast
 } from '@chakra-ui/react';
 import axios from 'axios';
 import { useState } from 'react';
@@ -14,34 +12,18 @@ import { useDispatch } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 import { authLogin } from '../features/auth/authSlice';
 
-function OrgSelect(props) {
-  const orgs = ['MISI: Solidariti', 'UNDI18'];
-  const orgOptions = orgs.map(name => {
-    return <option value={name}>{name}</option>;
-  });
-
-  return (
-    <Select placeholder={props.placeholder} onChange={props.onChange}>
-      {orgOptions}
-    </Select>
-  );
-}
-
 function Create() {
   const dispatch = useDispatch();
   const toast = useToast();
   const history = useHistory();
 
-  const [name, setName] = useState(null);
-  const [email, setEmail] = useState(null);
-  const [phoneNumber, setPhoneNumber] = useState(null);
-  const [org, setOrg] = useState(null);
+  const [telegram, setTelegram] = useState(null);
   const [password, setPassword] = useState(null);
 
   const handleSubmit = e => {
     e.preventDefault();
 
-    if (!name | !email | !phoneNumber | !org | !password) {
+    if (!telegram | !password) {
       toast({
         title: 'Problem!',
         description: 'Please fill in all the fields',
@@ -56,10 +38,7 @@ function Create() {
       .post(
         `${process.env.REACT_APP_API_URL}/create`,
         {
-          name: name,
-          email: email,
-          org: org,
-          phoneNumber: org,
+          telegram: telegram,
           password: password,
         },
         {
@@ -105,23 +84,8 @@ function Create() {
         <Heading mb={6}>Create Account</Heading>
         <form onSubmit={handleSubmit}>
           <FormControl mb={6}>
-            <FormLabel>Name:</FormLabel>
-            <Input onChange={e => setName(e.target.value)} />
-          </FormControl>
-          <FormControl mb={6}>
-            <FormLabel>Email:</FormLabel>
-            <Input type="email" onChange={e => setEmail(e.target.value)} />
-          </FormControl>
-          <FormControl mb={6}>
-            <FormLabel>Phone Number:</FormLabel>
-            <Input onChange={e => setPhoneNumber(e.target.value)} />
-          </FormControl>
-          <FormControl mb={6}>
-            <FormLabel>Organization:</FormLabel>
-            <OrgSelect
-              placeholder="Select Organization"
-              onChange={e => setOrg(e.target.value)}
-            />
+            <FormLabel>Telegram Username:</FormLabel>
+            <Input onChange={e => setTelegram(e.target.value)} />
           </FormControl>
           <FormControl mb={6}>
             <FormLabel>Password:</FormLabel>
diff --git a/src/screens/HomeScreen.js b/src/screens/HomeScreen.js
index df420f3..e940355 100644
--- a/src/screens/HomeScreen.js
+++ b/src/screens/HomeScreen.js
@@ -18,7 +18,9 @@ function QRCode() {
         }
       })
       .catch(err => {
-        if (err.response.status === 401) {
+        if(!err.response){
+          console.log("No response... Strange");
+        }else if (err.response.status === 401) {
           dispatch(authLogout());
         }
       });
diff --git a/src/screens/LoginScreen.js b/src/screens/LoginScreen.js
index a73aac9..7d3a751 100644
--- a/src/screens/LoginScreen.js
+++ b/src/screens/LoginScreen.js
@@ -5,7 +5,7 @@ import {
   FormLabel,
   Heading,
   Input,
-  useToast,
+  useToast
 } from '@chakra-ui/react';
 import axios from 'axios';
 import { React, useState } from 'react';
@@ -14,7 +14,7 @@ import { Redirect, useHistory } from 'react-router-dom';
 import { authLogin, authLogout } from '../features/auth/authSlice';
 
 function Login() {
-  const [email, setEmail] = useState(null);
+  const [telegram, setTelegram] = useState(null);
   const [password, setPassword] = useState(null);
   const toast = useToast();
   const history = useHistory();
@@ -24,10 +24,10 @@ function Login() {
   if (isAuthenticated) return <Redirect to="/home" />;
 
   const handleSubmit = e => {
-    if (!email | !password) {
+    if (!telegram | !password) {
       toast({
         title: 'Invalid Login',
-        description: 'Please fill in email and password',
+        description: 'Please fill in Telegram Username and password',
         status: 'error',
         duration: 9000,
         isClosable: true,
@@ -46,7 +46,7 @@ function Login() {
       .post(
         `${process.env.REACT_APP_API_URL}/login`,
         {
-          email: email,
+          telegram: telegram,
           password: password,
         },
         {
@@ -56,6 +56,7 @@ function Login() {
       .then(response => {
         if (response.data.authorized) {
           dispatch(authLogin());
+          toast.closeAll();
           history.push('/home');
         } else {
           dispatch(authLogout());
@@ -77,9 +78,6 @@ function Login() {
           duration: 9000,
           isClosable: true,
         });
-      })
-      .finally(() => {
-        toast.closeAll();
       });
 
     e.preventDefault();
@@ -101,15 +99,14 @@ function Login() {
         </Heading>
         <form onSubmit={handleSubmit}>
           <FormControl mb={6}>
-            <FormLabel>Email address</FormLabel>
+            <FormLabel>Telegram Username:</FormLabel>
             <Input
-              type="email"
               colorScheme="teal"
-              onChange={event => setEmail(event.target.value)}
+              onChange={event => setTelegram(event.target.value)}
             />
           </FormControl>
           <FormControl mb={6}>
-            <FormLabel>Password</FormLabel>
+            <FormLabel>Password:</FormLabel>
             <Input
               type="password"
               colorScheme="teal"