K3.1 Fixing some issues: #2385 #2383 #2380 #2351

#2385
#2383
#2380
#2351
+ integrate TFA login